From 335817b0de0d2515da2ae88e05e557493b9bc393 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 26 Jul 2017 15:52:59 +0200 Subject: [PATCH] Enable the "embedded" test --- tests/embedded.sh | 28 ++++++++++++++++++++++++++-- tests/project.conf | 6 ++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/tests/embedded.sh b/tests/embedded.sh index a0ca7a0..8d71a82 100755 --- a/tests/embedded.sh +++ b/tests/embedded.sh @@ -43,7 +43,7 @@ _embedded() objdir=$($MKTEMP -d) [ $? -eq 0 ] || return 2 - (cd .. && sh -c "$make OBJDIR='$objdir/' $TARGETS") + (cd ../src && sh -c "$make OBJDIR='$objdir/' $TARGETS") ret=$? [ $ret -eq 0 ] || echo "$PROGNAME: $1: Could not build for embedded" 1>&2 $RM -r -- "$objdir" @@ -52,4 +52,28 @@ _embedded() #main -_embedded || exit 2 +clean=0 +while getopts "cP:" name; do + case "$name" in + c) + clean=1 + ;; + P) + #XXX ignored for compatibility + ;; + ?) + _usage + exit $? + ;; + esac +done +shift $((OPTIND - 1)) +if [ $# -ne 1 ]; then + _usage + exit $? +fi +target="$1" + +[ $clean -ne 0 ] && exit 0 + +_embedded > "$target" 2>&1 || exit 2 diff --git a/tests/project.conf b/tests/project.conf index eeb3955..a2043c7 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -1 +1,7 @@ +targets=embedded.log dist=Makefile,embedded.sh + +[embedded.log] +type=script +script=./embedded.sh +depends=embedded.sh