diff -Naur acpica-unix2-20170831.orig/tests/aslts/bin/Do acpica-unix2-20170831/tests/aslts/bin/Do
--- acpica-unix2-20170831.orig/tests/aslts/bin/Do 2017-09-27 14:34:19.377122047 -0600
+++ acpica-unix2-20170831/tests/aslts/bin/Do 2017-09-27 14:42:18.728970485 -0600
@@ -20,12 +20,13 @@
#
# ASL - iASL compiler
# acpiexec - AcpiExec utility
+# acpibin - AcpiBin utility
# ASLTSDIR - pathname of root directory of aslts test suite
#
# External definitions required for particular command:
#
# 0 - ASLTSDIR, ASL
-# 1 - ASLTSDIR, acpiexec
+# 1 - ASLTSDIR, acpiexec, acpibin
# 2 - ASLTSDIR
# 3 - none
# 4 - ASLTSDIR
@@ -339,7 +340,7 @@
for f in $disasm_compile_dir/*
do
filename=`basename $f`
- acpibin -a "$f" "$normal_compile_dir/$filename" > /dev/null
+ $acpibin -a "$f" "$normal_compile_dir/$filename" > /dev/null
if [ $? -ne 0 ]; then
echo "[[ Error: $mode Binary compare for $filename failed ]]"
else
@@ -791,6 +792,12 @@
do_exit 1 "Undefined acpiexec variable! Set it to pathname of AcpiExec utility."
fi
+ # Check access to AcpiBin utility
+
+ if [ ! -f "$acpibin" ]; then
+ do_exit 1 "Undefined acpibin variable! Set it to pathname of AcpiBin utility."
+ fi
+
shift 1
ASLTSRUN_PARAMS=
diff -Naur acpica-unix2-20170831.orig/tests/aslts/HOW_TO_INSTALL acpica-unix2-20170831/tests/aslts/HOW_TO_INSTALL
--- acpica-unix2-20170831.orig/tests/aslts/HOW_TO_INSTALL 2017-09-27 14:34:19.376122049 -0600
+++ acpica-unix2-20170831/tests/aslts/HOW_TO_INSTALL 2017-09-27 14:39:12.832417070 -0600
@@ -49,12 +49,16 @@
> export ASL="c:/acpica/libraries/iasl.exe"
- For test execution, two additional variables are required:
+ For test execution, three additional variables are required:
acpiexec - path to acpiexec utility: (example)
> export acpiexec="c:/acpica/libraries/acpiexec.exe"
+ acpibin - path to acpibin utility: (example)
+
+ > export acpibin="c:/acpica/libraries/acpibin.exe"
+
ASLTSDIR - path to the aslts directory: (example)
> export ASLTSDIR="c:/acpica/tests/aslts"
diff -Naur acpica-unix2-20170831.orig/tests/aslts/HOW_TO_USE acpica-unix2-20170831/tests/aslts/HOW_TO_USE
--- acpica-unix2-20170831.orig/tests/aslts/HOW_TO_USE 2017-09-27 14:34:19.376122049 -0600
+++ acpica-unix2-20170831/tests/aslts/HOW_TO_USE 2017-09-27 14:39:49.601328739 -0600
@@ -32,6 +32,10 @@
> export acpiexec="c:/acpica/libraries/acpiexec.exe"
+ acpibin - path to acpibin utility: (example)
+
+ > export acpibin="c:/acpica/libraries/acpibin.exe"
+
ASLTSDIR - path to the aslts directory: (example)
> export ASLTSDIR="c:/acpica/tests/aslts"
diff -Naur acpica-unix2-20170831.orig/tests/aslts.sh acpica-unix2-20170831/tests/aslts.sh
--- acpica-unix2-20170831.orig/tests/aslts.sh 2017-09-27 14:34:19.375122051 -0600
+++ acpica-unix2-20170831/tests/aslts.sh 2017-09-27 14:37:51.920611447 -0600
@@ -7,6 +7,7 @@
postfix=`date +%H%M%S`
tmp_iasl=/tmp/iasl-$postfix
tmp_acpiexec=/tmp/acpiexec-$postfix
+tmp_acpibin=/tmp/acpibin-$postfix
TEST_CASES=
TEST_MODES=
@@ -65,6 +66,7 @@
export ASL=$tmp_iasl
export acpiexec=$tmp_acpiexec
+ export acpibin=$tmp_acpibin
export ASLTSDIR=$aslts_dir
export PATH=$ASLTSDIR/bin:$PATH
}
@@ -75,7 +77,7 @@
restore_dir=$PWD
cd ${generation_dir}
- rm -f $tmp_iasl $tmp_acpiexec
+ rm -f $tmp_iasl $tmp_acpiexec $tmp_acpibin
# Build native-width iASL compiler and acpiexec
if [ ! -e bin/iasl -o ! -e bin/acpiexec ]; then
@@ -91,6 +93,7 @@
echo "Installing ACPICA tools"
cp bin/iasl $tmp_iasl
cp bin/acpiexec $tmp_acpiexec
+ cp bin/acpibin $tmp_acpibin
else
echo "Could not find iASL/acpiexec tools"
exit
@@ -103,6 +106,9 @@
elif [ ! -f $tmp_acpiexec ] ; then
echo "acpiexec utility not found"
exit
+ elif [ ! -f $tmp_acpibin ] ; then
+ echo "acpibin utility not found"
+ exit
fi
cd $restore_dir
@@ -140,7 +146,7 @@
echo "ASL Test Suite Finished: `date`"
echo " Started: $start_time"
- rm -f $tmp_iasl $tmp_acpiexec
+ rm -f $tmp_iasl $tmp_acpiexec $tmp_acpibin
fi;
}