From e1adbaa2ab3f93a3c4efafa38f6d8d747e271df2 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Aug 27 2013 15:21:34 +0000 Subject: still mucking about with test paths for misc tests --- diff --git a/debian/patches/add-testing.patch b/debian/patches/add-testing.patch index 3aed01b..75152dd 100644 --- a/debian/patches/add-testing.patch +++ b/debian/patches/add-testing.patch @@ -2,7 +2,7 @@ Index: acpica-unix/Makefile =================================================================== --- acpica-unix.orig/Makefile 2013-01-31 15:25:49.000000000 -0700 +++ acpica-unix/Makefile 2013-01-31 15:25:49.000000000 -0700 -@@ -14,3 +14,27 @@ +@@ -14,3 +14,28 @@ include generate/unix/Makefile.config include generate/unix/Makefile.common @@ -17,6 +17,7 @@ Index: acpica-unix/Makefile + $(CURDIR)/debian/run-aapits.sh $(CURDIR)/tests/aapits $(CURDIR)/generate/unix/bin + + # misc tests ++ cd $(CURDIR)/tests/misc + $(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20130823 + + # Template tests diff --git a/debian/run-misc-tests.sh b/debian/run-misc-tests.sh index 45a426a..a54961b 100755 --- a/debian/run-misc-tests.sh +++ b/debian/run-misc-tests.sh @@ -6,7 +6,7 @@ # iasl precisely because we expect it to stop when presented with # faulty ASL. # -# this script assumes it is in the source 'tests' directory at +# this script assumes it is in the source 'tests/misc' directory at # start. # @@ -14,7 +14,6 @@ set -x BINDIR="$1/generate/unix/bin" DEBDIR="$1/debian" -MISCDIR="$1/tests/misc" VERSION="$2" # create files to compare against @@ -31,22 +30,22 @@ WHEN=`date +"%b %_d %Y"` sed -e "s/XXXXXXXXXXX/$WHEN/" \ -e "s/YYYY/$BITS/" \ -e "s/VVVVVVVV/$VERSION/" \ - $DEBDIR/badcode.asl.result > $MISCDIR/badcode.asl.result + $DEBDIR/badcode.asl.result > badcode.asl.result sed -e "s/XXXXXXXXXXX/$WHEN/" \ -e "s/YYYY/$BITS/" \ -e "s/VVVVVVVV/$VERSION/" \ - $DEBDIR/grammar.asl.result > $MISCDIR/grammar.asl.result + $DEBDIR/grammar.asl.result > grammar.asl.result # see if badcode.asl failed as expected # NB: the -f option is required so we can see all of the errors -$BINDIR/iasl -f $MISCDIR/badcode.asl 2>&1 | tee $MISCDIR/badcode -diff $MISCDIR/badcode $MISCDIR/badcode.asl.result >/dev/null 2>&1 +$BINDIR/iasl -f badcode.asl 2>&1 | tee badcode +diff badcode badcode.asl.result >/dev/null 2>&1 [ $? -eq 0 ] || exit 1 # see if grammar.asl failed as expected # NB: the -f option is required so we can see all of the errors -$BINDIR/iasl -f -of $MISCDIR/grammar.asl 2>&1 | tee $MISCDIR/grammar -diff $MISCDIR/grammar $MISCDIR/grammar.asl.result >/dev/null 2>&1 +$BINDIR/iasl -f -of grammar.asl 2>&1 | tee grammar +diff grammar grammar.asl.result >/dev/null 2>&1 [ $? -eq 0 ] || exit 1 exit 0