[PATCH 3/5] fwts-test: Update disassemble-0001 test (LP: #1201250)

Keng-Yu Lin kengyu at canonical.com
Tue Feb 11 12:49:55 UTC 2014


A previous patch makes --disassemble-aml able to accept an argument
as the output directory.

Update the test to use that too.

Signed-off-by: Keng-Yu Lin <kengyu at canonical.com>
---
 fwts-test/disassemble-0001/DSDT.dsl.orig            |  2 +-
 fwts-test/disassemble-0001/SSDT0.dsl.orig           |  2 +-
 fwts-test/disassemble-0001/SSDT1.dsl.orig           |  2 +-
 fwts-test/disassemble-0001/SSDT2.dsl.orig           |  2 +-
 fwts-test/disassemble-0001/SSDT3.dsl.orig           |  2 +-
 fwts-test/disassemble-0001/SSDT4.dsl.orig           |  2 +-
 fwts-test/disassemble-0001/disassemble-aml-0001.log | 12 ++++++------
 fwts-test/disassemble-0001/test-0001.sh             |  4 +---
 8 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/fwts-test/disassemble-0001/DSDT.dsl.orig b/fwts-test/disassemble-0001/DSDT.dsl.orig
index 71f94fb..f805f6c 100644
--- a/fwts-test/disassemble-0001/DSDT.dsl.orig
+++ b/fwts-test/disassemble-0001/DSDT.dsl.orig
@@ -1,7 +1,7 @@
 /*
  * Intel ACPI Component Architecture
  * AML Disassembler version 20130418-64 [May  2 2013]
- * Copyright (c) 2000 - 2013 Intel Corporation
+ * Copyright (c) 2000 - 2014 Intel Corporation
  * 
  * Disassembly of /tmp/fwts_iasl_12884_DSDT.dat, Fri May  3 09:41:56 2013
  *
diff --git a/fwts-test/disassemble-0001/SSDT0.dsl.orig b/fwts-test/disassemble-0001/SSDT0.dsl.orig
index f0acdcc..5325c73 100644
--- a/fwts-test/disassemble-0001/SSDT0.dsl.orig
+++ b/fwts-test/disassemble-0001/SSDT0.dsl.orig
@@ -1,7 +1,7 @@
 /*
  * Intel ACPI Component Architecture
  * AML Disassembler version 20130418-64 [May  2 2013]
- * Copyright (c) 2000 - 2013 Intel Corporation
+ * Copyright (c) 2000 - 2014 Intel Corporation
  * 
  * Disassembly of /tmp/fwts_iasl_12884_SSDT.dat, Fri May  3 09:41:56 2013
  *
diff --git a/fwts-test/disassemble-0001/SSDT1.dsl.orig b/fwts-test/disassemble-0001/SSDT1.dsl.orig
index bac5a3f..1089176 100644
--- a/fwts-test/disassemble-0001/SSDT1.dsl.orig
+++ b/fwts-test/disassemble-0001/SSDT1.dsl.orig
@@ -1,7 +1,7 @@
 /*
  * Intel ACPI Component Architecture
  * AML Disassembler version 20130418-64 [May  2 2013]
- * Copyright (c) 2000 - 2013 Intel Corporation
+ * Copyright (c) 2000 - 2014 Intel Corporation
  * 
  * Disassembly of /tmp/fwts_iasl_12884_SSDT.dat, Fri May  3 09:41:56 2013
  *
diff --git a/fwts-test/disassemble-0001/SSDT2.dsl.orig b/fwts-test/disassemble-0001/SSDT2.dsl.orig
index 7646a74..8ea0da3 100644
--- a/fwts-test/disassemble-0001/SSDT2.dsl.orig
+++ b/fwts-test/disassemble-0001/SSDT2.dsl.orig
@@ -1,7 +1,7 @@
 /*
  * Intel ACPI Component Architecture
  * AML Disassembler version 20130418-64 [May  2 2013]
- * Copyright (c) 2000 - 2013 Intel Corporation
+ * Copyright (c) 2000 - 2014 Intel Corporation
  * 
  * Disassembly of /tmp/fwts_iasl_12884_SSDT.dat, Fri May  3 09:41:56 2013
  *
diff --git a/fwts-test/disassemble-0001/SSDT3.dsl.orig b/fwts-test/disassemble-0001/SSDT3.dsl.orig
index ff8e859..84ce61b 100644
--- a/fwts-test/disassemble-0001/SSDT3.dsl.orig
+++ b/fwts-test/disassemble-0001/SSDT3.dsl.orig
@@ -1,7 +1,7 @@
 /*
  * Intel ACPI Component Architecture
  * AML Disassembler version 20130418-64 [May  2 2013]
- * Copyright (c) 2000 - 2013 Intel Corporation
+ * Copyright (c) 2000 - 2014 Intel Corporation
  * 
  * Disassembly of /tmp/fwts_iasl_12884_SSDT.dat, Fri May  3 09:41:56 2013
  *
diff --git a/fwts-test/disassemble-0001/SSDT4.dsl.orig b/fwts-test/disassemble-0001/SSDT4.dsl.orig
index 03826ef..026f6c7 100644
--- a/fwts-test/disassemble-0001/SSDT4.dsl.orig
+++ b/fwts-test/disassemble-0001/SSDT4.dsl.orig
@@ -1,7 +1,7 @@
 /*
  * Intel ACPI Component Architecture
  * AML Disassembler version 20130418-64 [May  2 2013]
- * Copyright (c) 2000 - 2013 Intel Corporation
+ * Copyright (c) 2000 - 2014 Intel Corporation
  * 
  * Disassembly of /tmp/fwts_iasl_12884_SSDT.dat, Fri May  3 09:41:56 2013
  *
diff --git a/fwts-test/disassemble-0001/disassemble-aml-0001.log b/fwts-test/disassemble-0001/disassemble-aml-0001.log
index c1ee193..84db0ca 100644
--- a/fwts-test/disassemble-0001/disassemble-aml-0001.log
+++ b/fwts-test/disassemble-0001/disassemble-aml-0001.log
@@ -1,6 +1,6 @@
-Disassembled DSDT to DSDT.dsl
-Disassembled SSDT 0 to SSDT0.dsl
-Disassembled SSDT 1 to SSDT1.dsl
-Disassembled SSDT 2 to SSDT2.dsl
-Disassembled SSDT 3 to SSDT3.dsl
-Disassembled SSDT 4 to SSDT4.dsl
+Disassembled DSDT to /tmp/disassemble-aml/DSDT.dsl
+Disassembled SSDT 0 to /tmp/disassemble-aml/SSDT0.dsl
+Disassembled SSDT 1 to /tmp/disassemble-aml/SSDT1.dsl
+Disassembled SSDT 2 to /tmp/disassemble-aml/SSDT2.dsl
+Disassembled SSDT 3 to /tmp/disassemble-aml/SSDT3.dsl
+Disassembled SSDT 4 to /tmp/disassemble-aml/SSDT4.dsl
diff --git a/fwts-test/disassemble-0001/test-0001.sh b/fwts-test/disassemble-0001/test-0001.sh
index 933f529..1fe4c32 100755
--- a/fwts-test/disassemble-0001/test-0001.sh
+++ b/fwts-test/disassemble-0001/test-0001.sh
@@ -7,9 +7,7 @@ TMPLOG=$TMP/disassemble-aml.log.$$
 HERE=`pwd`
 
 mkdir $TMPDIR
-pushd $TMPDIR >& /dev/null
-$FWTS -w 80 --dumpfile=$HERE/acpidump.log --disassemble-aml - > $TMPLOG
-popd > /dev/null
+$FWTS -w 80 --dumpfile=$HERE/acpidump.log --disassemble-aml=$TMPDIR - > $TMPLOG
 
 failed=0
 TEST="Test --disassemble-aml output to stdout"
-- 
1.8.1.2




More information about the fwts-devel mailing list