summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobert Moore <Robert.Moore@intel.com>2012-04-04 14:14:35 -0700
committerRobert Moore <Robert.Moore@intel.com>2012-04-04 14:14:35 -0700
commitb762724fb03b502d230eb890b2c6ac288089f1ce (patch)
tree536746b9639d238aa32fd8c534503aa84f3b74b1 /tests
parent05833ed9d89c2480cb6248bb052fc1bfa5b7ac38 (diff)
downloadacpica-b762724fb03b502d230eb890b2c6ac288089f1ce.tar.gz
Tests: for ASLTS, enable iASL error messages and send to logfile.
Messages sent to error.txt file.
Diffstat (limited to 'tests')
-rw-r--r--tests/aslts/Makefile.def11
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/aslts/Makefile.def b/tests/aslts/Makefile.def
index 29db4c666..13934c2ba 100644
--- a/tests/aslts/Makefile.def
+++ b/tests/aslts/Makefile.def
@@ -25,8 +25,10 @@
SETOF_INDEXES= 0 1 2 3
SETOF_AMLDIRS= nopt/32 nopt/64 opt/32 opt/64
SETOF_ASLFAGS= "-oa -r 1" "-oa -r 2" "-r 1" "-r 2"
-COMMON_ASL_FLAGS= "-cr -vs -va"
+COMMON_ASL_FLAGS= "-cr -vs"
+
COMPILER_LOG="$(TOP)/tmp/aml/$(aslversion)/compile.txt"
+COMPILER_ERROR_LOG="$(TOP)/tmp/aml/$(aslversion)/error.txt"
# Create general directory
@@ -52,16 +54,18 @@ install_all_modes_of_test_case: ${SETOF_AMLDIRS:%=$(TOP)/tmp/aml/$(aslversion)/%
if [ -f "$(ASL)" ]; then \
dd=`pwd`; \
echo "---- Test path: $$dd" >> $(COMPILER_LOG); \
+ echo "---- Test path: $$dd" >> $(COMPILER_ERROR_LOG); \
for i in ${SETOF_INDEXES}; do \
set -- $(SETOF_AMLDIRS); \
shift $$i; \
CUR_AMLDIR=$$1; \
echo "---- Test type: $$CUR_AMLDIR (Flags $(COMMON_ASL_FLAGS) $$CUR_ASLFLAGS $(ADD_ASLFLAGS))" >> $(COMPILER_LOG); \
+ echo "---- Test type: $$CUR_AMLDIR (Flags $(COMMON_ASL_FLAGS) $$CUR_ASLFLAGS $(ADD_ASLFLAGS))" >> $(COMPILER_ERROR_LOG); \
set -- $(SETOF_ASLFAGS); \
shift $$i; \
CUR_ASLFLAGS=$$1; \
for j in ${ASLMOD} $(ASLMODADD); do \
- "$(ASL)" $$CUR_ASLFLAGS "$(COMMON_ASL_FLAGS)" $(ADD_ASLFLAGS) $$j.asl >> $(COMPILER_LOG); \
+ "$(ASL)" $$CUR_ASLFLAGS "$(COMMON_ASL_FLAGS)" $(ADD_ASLFLAGS) $$j.asl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
echo "" >> $(COMPILER_LOG); \
ret=$$?; \
if [ $$ret != 0 ]; then rval=1; echo "**** Unexpected iASL failure!"; exit 1; fi; \
@@ -83,7 +87,6 @@ install_all_modes_of_test_case: ${SETOF_AMLDIRS:%=$(TOP)/tmp/aml/$(aslversion)/%
# Move results to aslts/tmp/aml directory.
# Determine current version of iASL.
# Create aslts/tmp/aml/<version> directory with the precautions.
-#aslversion=`echo "$$x" | awk -F" " '{ print $$5}'`; \
install_test_case:
@if [ ! -f "$(ASL)" ]; then \
@@ -100,7 +103,7 @@ install_test_case:
if [ x$$base != xaslts ]; then \
echo "Bad base name of ASLTS Test Suite: <$$base> of <$$dd>"; exit 1; \
else \
- x=`"$(ASL)" xxx | grep "Compiler version"`; \
+ x=`"$(ASL)" -va xxx | grep "Compiler version"`; \
echo "---- iASL version: $$x"; \
if [ -z "$$x" ]; then \
echo "Bad iASL 2: bad signon <$(ASL)>"; exit 1; \