From 22392df24e37a3909640d108ef924363429e8144 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Apr 01 2020 21:51:25 +0000
Subject: Clean up some of the expected results


NB: this required not using one patch temporarily (big-endian-v3)
which may still turn out to be needed but in some corrected form.

Signed-off-by: Al Stone <ahs3@redhat.com>

---

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 7d9848a..a8b36ba 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -48,7 +48,7 @@ Patch20:	aslcodegen.patch
 Patch21:	facp.patch
 Patch24:	armv7-str-fixes.patch
 Patch25:	dbtest.patch
-Patch27:	big-endian-v3.patch
+#Patch27:	big-endian-v3.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -124,7 +124,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch21 -p1 -b .facp
 %patch24 -p1 -b .armv7-str-fixes
 %patch25 -p1 -b .dbtest
-%patch27 -p1 -b .big-endian-v3
+#%patch27 -p1 -b .big-endian-v3
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
diff --git a/converterSample.asl.result b/converterSample.asl.result
index 34cb693..47c532c 100644
--- a/converterSample.asl.result
+++ b/converterSample.asl.result
@@ -18,7 +18,9 @@ Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
 Copyright (c) 2000 - 2020 Intel Corporation
 
+Ignoring all errors, forcing AML file generation
+
 ASL Input:     converterSample.asl -    1968 bytes     11 keywords     85 source lines
-AML Output:    converterSample.aml -     180 bytes      2 opcodes       9 named objects
+AML Output:    converterSample.aml -     182 bytes      2 opcodes       9 named objects
 
-Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 12 Optimizations, 1 Constants Folded
+Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 10 Optimizations
diff --git a/run-misc-tests.sh b/run-misc-tests.sh
index e16babf..c0da397 100644
--- a/run-misc-tests.sh
+++ b/run-misc-tests.sh
@@ -16,7 +16,7 @@ BINDIR="$1"
 VERSION="$2"
 
 # create files to compare against
-$BINDIR/iasl -h
+$BINDIR/iasl -hZZ
 
 sed -e "s/VVVVVVVV/$VERSION/" \
     ../badcode.asl.result > misc/badcode.asl.expected
@@ -39,9 +39,10 @@ $BINDIR/iasl -f -of grammar.asl 2>&1 | tee grammar.asl.actual
 diff grammar.asl.actual grammar.asl.expected >/dev/null 2>&1
 [ $? -eq 0 ] || exit 1
 
-# see if converterSample.asl succeeded as expected
-$BINDIR/iasl converterSample.asl 2>&1 | tee converterSample.asl.actual
+# see if converterSample.asl failed as expected
+# NB: the -f option is required so we can see all of the errors
+$BINDIR/iasl -f -of converterSample.asl 2>&1 | tee converterSample.asl.actual
 diff converterSample.asl.actual converterSample.asl.expected >/dev/null 2>&1
-[ $? -ne 0 ] && exit 1
+[ $? -eq 0 ] || exit 1
 
 exit 0