ASLTS: refactor removal of artifact files to retain clean test directory when test run is successful.

This applies to the binary comparison portion of the ASLTS script.

Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
This commit is contained in:
Erik Schmauss 2017-03-10 15:53:13 -08:00
parent 6134f5331a
commit 5c6cd994f0

View File

@ -102,18 +102,9 @@ install_all_modes_of_test_case: ${SETOF_AMLDIRS:%=$(TOP)/tmp/aml/$(aslversion)/%
>&2 printf " Flags used: $$CUR_ASLFLAGS "$(COMMON_ASL_FLAGS)" $(ADD_ASLFLAGS)\n\n"; \
#exit 1; \
fi; \
rm $$k-aslminus.asm; \
rm $$k-aslminus.c; \
rm $$k-aslminus.h; \
rm $$k-aslminus.i; \
rm $$k-aslminus.hex; \
rm $$k-aslminus.map; \
rm $$k-aslminus.nsp; \
rm $$k-aslminus.offset.h; \
rm $$k-aslminus.src; \
rm $$k-extInPlace.aml; \
if [ $$CUR_AMLDIR = "nopt/32" ] || [ $$CUR_AMLDIR = "nopt/64" ]; then \
>&2 printf " => Binary compare"; \
rm -f comparison_output.txt; \
acpibin -c $$k.aml $$k-aslminus.aml >> comparison_output.txt; \
if [ $$? != 0 ]; then \
>&2 printf " [[ Error: comparison of $$k.aml and $$k-aslminus.aml do not match ]]"; \
@ -123,12 +114,23 @@ install_all_modes_of_test_case: ${SETOF_AMLDIRS:%=$(TOP)/tmp/aml/$(aslversion)/%
>&2 printf " "; \
#exit 1; \
else \
>&2 printf " => Removing files"; \
rm $$k-aslminus.lst; \
rm $$k-aslminus.aml; \
rm $$k-aslminus.dsl; \
>&2 printf " => Succes!"; \
rm comparison_output.txt; \
fi; \
fi; \
if [ ! -f comparison_output.txt ]; then \
>&2 printf " => Removing files"; \
rm $$k-aslminus.lst; \
rm $$k-aslminus.aml; \
rm $$k-aslminus.dsl; \
fi; \
for n in "$$k-aslminus" "$$k-extInPlace"; do \
rm $$n.i $$n.asm $$n.nsp; \
rm $$n.c $$n.hex $$n.map; \
rm $$n.h $$n.src $$n.offset.h; \
done; \
rm $$k-extInPlace.aml; \
rm $$k-extInPlace.lst; \
>&2 printf " => Done"; \
done; \
fi; \