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