Merge pull request #315 from SchmErik/aslts_script

Aslts script adjustments to improve general flow of execution

5 files changed, 24 insertions, 19 deletions

diff --git a/tests/aslts/Makefile.def b/tests/aslts/Makefile.def
index 8666f1cee..294b1da7a 100644
--- a/tests/aslts/Makefile.def
+++ b/tests/aslts/Makefile.def
@@ -109,11 +109,10 @@ install_all_modes_of_test_case:	$(TOP)/tmp/aml/$(ASLTS_VER)/$(ASLTS_AMLDIR)
 			rm $$j.nsp; \
 			rm $$j.offset.h; \
 			rm $$j.src; \
-			>&2 printf " => Done"; \
+			>&2 printf " => Done "; \
 			if [ $$ret != 0 ]; then \
 				rval=1; \
 				>&2 echo "**** Unexpected iASL failure in $$dd/$$j.asl!"; \
-				exit 1; \
 			fi; \
 		done; \
 		>&2 echo ""; \
@@ -127,9 +126,8 @@ install_all_modes_of_test_case:	$(TOP)/tmp/aml/$(ASLTS_VER)/$(ASLTS_AMLDIR)
 		done; \
 	else \
 		echo "Bad iASL 0: <$(ASL)> does not exist"; \
-		rval=1; \
-	fi; \
-	if [ $$rval != 0 ]; then exit 1; fi
+		exit 1; \
+	fi;
 
 # Make-install one particular Test Case for all modes.
 
@@ -148,19 +146,19 @@ install_test_case:
 	fi
 
 
-TEST_SEQUENCE_ASL_FLAGS="$(ASLTS_ASLFLAGS) $(COMMON_NO_OUTPUT_ASL_FLAGS) $(ADD_ASLFLAGS)"
+TEST_SEQUENCE_ASL_FLAGS="$(ASLTS_ASLFLAGS) $(COMMON_NO_OUTPUT_ASL_FLAGS)"
 
 disasm_test_compile: $(TOP)/tmp/aml/$(ASLTS_VER)/$(ASLTS_AMLDIR)
 	@rval=0; \
 	for j in ${ASLMOD} $(ASLMODADD); do \
 		for k in ${AMLMOD}; do \
 			>&2 printf  " => Compile with externals in place"; \
-			"$(ASL)" -p $$k-extInPlace -oE $(TEST_SEQUENCE_ASL_FLAGS) $$j.asl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
+			"$(ASL)" -p $$k-extInPlace -oE $(ADD_ASLFLAGS) $(TEST_SEQUENCE_ASL_FLAGS) $$j.asl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
 			ret=$$?; \
 			if [ $$ret != 0 ]; then \
 				rval=2; \
 				>&2 printf " [[ Error: compiling $$k.aml with externals in place failed ]]\n"; \
-				>&2 printf "          Flags used: -p $$k-extInPlace -oE $(TEST_SEQUENCE_ASL_FLAGS)\n\n"; \
+				>&2 printf "          Flags used: -p $$k-extInPlace -oE $(ADD_ASLFLAGS) $(TEST_SEQUENCE_ASL_FLAGS)\n\n"; \
 			fi; \
 		done; \
 	done; \
@@ -184,12 +182,12 @@ disasm_test_recompile: disasm_test_disassemble
 	@rval=0; \
 	for k in ${AMLMOD}; do \
 		>&2 printf " => Recompile\n"; \
-		"$(ASL)" $(TEST_SEQUENCE_ASL_FLAGS) $$k.dsl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
+		"$(ASL)" $(ADD_ASLFLAGS) $(TEST_SEQUENCE_ASL_FLAGS) $$k.dsl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
 		ret=$$?; \
 		if [ $$ret != 0 ]; then \
 			rval=2; \
 			>&2 printf " [[ Error: re-compilation of $$k-$$l.dsl failed]]\n"; \
-			>&2 printf "          Flags used: $(TEST_SEQUENCE_ASL_FLAGS)\n\n"; \
+			>&2 printf "          Flags used: $(ADD_ASLFLAGS) $(TEST_SEQUENCE_ASL_FLAGS)\n\n"; \
 		fi; \
 		rm $$k.dsl; \
 		echo "---- Move: $$k.aml $(TOP)/tmp/aml/$(ASLTS_VER)/$(ASLTS_AMLDIR)" >> $(COMPILER_LOG); \
@@ -210,7 +208,7 @@ converter_test_convert: $(TOP)/tmp/aml/$(ASLTS_VER)/$(ASLTS_AMLDIR)
 	@rval=0; \
 	for j in ${ASLMOD} $(ASLMODADD); do \
 		>&2 printf  "  Convert"; \
-		"$(ASL)" -cr -ca $$j.asl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
+		"$(ASL)" $(ADD_ASLFLAGS) -cr -ca $$j.asl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
 		ret=$$?; \
 		if [ $$ret != 0 ]; then \
 			rval=2; \
@@ -225,12 +223,12 @@ converter_test_recompile: converter_test_convert
 	for j in ${ASLMOD} $(ASLMODADD); do \
 		for k in ${AMLMOD}; do \
 			>&2 printf " => Recompile"; \
-			"$(ASL)" $(TEST_SEQUENCE_ASL_FLAGS) -p $$k $$j.dsl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
+			"$(ASL)" $(ADD_ASLFLAGS) $(TEST_SEQUENCE_ASL_FLAGS) -p $$k $$j.dsl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
 			ret=$$?; \
 			if [ $$ret != 0 ]; then \
 				rval=2; \
 				>&2 printf " [[ Error: re-compilation of $$j.dsl failed]]\n"; \
-				>&2 printf "          Flags used: $(TEST_SEQUENCE_ASL_FLAGS) -p $$k\n\n"; \
+				>&2 printf "          Flags used: $(ADD_ASLFLAGS) $(TEST_SEQUENCE_ASL_FLAGS) -p $$k\n\n"; \
 			else \
 				>&2 printf " => Done\n"; \
 			fi; \
diff --git a/tests/aslts/bin/Do b/tests/aslts/bin/Do
index 0ea8d6821..d034072d4 100755
--- a/tests/aslts/bin/Do
+++ b/tests/aslts/bin/Do
@@ -333,21 +333,25 @@ binary_compare()
 	echo "    $disasm_compile_dir"
 
 	if [ ! -d $disasm_compile_dir ]; then
-		echo "$dism_compile_dir does not exist. Aborting binary compare"
+		echo "  $dism_compile_dir does not exist. Aborting binary compare"
 		return;
 	fi
 	if [ ! -d $normal_compile_dir ]; then
-		echo "$normal_compile_dir does not exist. Aborting binary compare"
+		echo "  $normal_compile_dir does not exist. Aborting binary compare"
 		return;
 	fi
 	for f in $disasm_compile_dir/*
 	do
 		filename=`basename $f`
-		acpibin -a "$f" "$normal_compile_dir/$filename" > /dev/null
-		if [ $? -ne 0 ]; then
-			echo "[[ Error: $mode Binary compare for $filename failed ]]"
+                if [ ! -f "$normal_compile_dir/$filename" ]; then
+			echo "  binary compare $mode the following file does not exist: $normal_compile_dir/$filename"
 		else
-			echo "$mode Binary compare for $filename passed"
+			acpibin -a "$f" "$normal_compile_dir/$filename" > /dev/null
+			if [ $? -ne 0 ]; then
+				echo " [[ Error: $mode Binary compare for $filename failed ]]"
+			else
+				echo "  $mode Binary compare for $filename passed"
+			fi
 		fi
 	done
 }
diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/Makefile b/tests/aslts/src/runtime/collections/Identity2MS/abbu/Makefile
index eb3b08734..f864cf4be 100644
--- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/Makefile
+++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/Makefile
@@ -4,5 +4,6 @@ ASLMODADD=	MAIN_ASLTS
 AMLMOD= extra extra_aslts
 COLL= ../..
 
+ADD_ASLFLAGS=-vx 6152
 TOP= $(COLL)/../../..
 include $(COLL)/Makefile.install
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemo/Makefile b/tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemo/Makefile
index 7ff45a841..b7689db24 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemo/Makefile
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemo/Makefile
@@ -3,5 +3,6 @@
 AMLMOD= bdemo
 COLL= ../../..
 
+ADD_ASLFLAGS=-vx 6152
 TOP= $(COLL)/../../..
 include $(COLL)/Makefile.install
diff --git a/tests/aslts/src/runtime/collections/functional/control/Makefile b/tests/aslts/src/runtime/collections/functional/control/Makefile
index 2fdb4b3ee..d15caa56c 100644
--- a/tests/aslts/src/runtime/collections/functional/control/Makefile
+++ b/tests/aslts/src/runtime/collections/functional/control/Makefile
@@ -3,5 +3,6 @@
 AMLMOD= control
 COLL= ../..
 
+ADD_ASLFLAGS=-vx 6152
 TOP= $(COLL)/../../..
 include $(COLL)/Makefile.install