summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorErik Schmauss <erik.schmauss@intel.com>2017-09-15 15:00:09 -0700
committerErik Schmauss <erik.schmauss@intel.com>2017-09-15 15:00:09 -0700
commit1ed56f34024b6057fc96a557b6b422301ae74489 (patch)
treef875fe4884386cc8232f8f2696b7f5a4f3aad075 /tests
parent3a3290c7db704a48d3310a0b7a165b81bb625f1a (diff)
downloadacpica-1ed56f34024b6057fc96a557b6b422301ae74489.tar.gz
ASLTS: script: fix ADD_FLAGS parameter for compilation and conversion targets
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/aslts/Makefile.def16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/aslts/Makefile.def b/tests/aslts/Makefile.def
index 8666f1cee..778f90eda 100644
--- a/tests/aslts/Makefile.def
+++ b/tests/aslts/Makefile.def
@@ -148,19 +148,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 +184,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 +210,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 +225,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; \