[test-suite] r263315 - [LNTBased/SPEC] Fix 403.gcc and 471.omnetpp checking

[Adam Nemet via llvm-commits]

Author: anemet
Date: Fri Mar 11 18:52:02 2016
New Revision: 263315

URL: http://llvm.org/viewvc/llvm-project?rev=263315&view=rev
Log:
[LNTBased/SPEC] Fix 403.gcc and 471.omnetpp checking

Modified:
    test-suite/trunk/LNTBased/speccpu2006/int/403.gcc/TestModule
    test-suite/trunk/LNTBased/speccpu2006/int/471.omnetpp/TestModule

Modified: test-suite/trunk/LNTBased/speccpu2006/int/403.gcc/TestModule
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/LNTBased/speccpu2006/int/403.gcc/TestModule?rev=263315&r1=263314&r2=263315&view=diff
==============================================================================
--- test-suite/trunk/LNTBased/speccpu2006/int/403.gcc/TestModule (original)
+++ test-suite/trunk/LNTBased/speccpu2006/int/403.gcc/TestModule Fri Mar 11 18:52:02 2016
@@ -9,13 +9,13 @@ class SPEC2006_403_gcc(spec.TestModule):
     benchmark = '403.gcc'
 
     train_input_set = ['train/input/integrate.i']
-    train_output_set = []
+    train_output_set = ['train/output/integrate.s']
     train_args = ['integrate.i -o - > 403.gcc.integrate.out 2> 403.gcc.integrate.err']
-    train_cmp_cmds = ['']
+    train_cmp_cmds = ['diff 403.gcc.integrate.out integrate.s --strip-trailing-cr > 403.gcc.integrate.cmp']
     ref_input_set = ['ref/input/166.i', 'ref/input/200.i', 'ref/input/c-typeck.i', 'ref/input/cp-decl.i', 'ref/input/expr.i', 'ref/input/expr2.i', 'ref/input/scilab.i']
-    ref_output_set = []
+    ref_output_set = ['ref/output/166.s', 'ref/output/200.s', 'ref/output/c-typeck.s', 'ref/output/cp-decl.s', 'ref/output/expr.s', 'ref/output/expr2.s', 'ref/output/scilab.s']
     ref_args = ['166.i -o - > 403.gcc.166.out 2> 403.gcc.166.err', '200.i -o - > 403.gcc.200.out 2> 403.gcc.200.err', 'c-typeck.i -o - > 403.gcc.c-typeck.out 2> 403.gcc.c-typeck.err', 'cp-decl.i -o - > 403.gcc.cp-decl.out 2> 403.gcc.cp-decl.err', 'expr.i -o - > 403.gcc.expr.out 2> 403.gcc.expr.err', 'expr2.i -o - > 403.gcc.expr2.out 2> 403.gcc.expr2.err', 'scilab.i -o - > 403.gcc.scilab.out 2> 403.gcc.scilab.err']
-    ref_cmp_cmds = []
+    ref_cmp_cmds = ['diff 403.gcc.166.out 166.s --strip-trailing-cr > 403.gcc.166.cmp', 'diff 403.gcc.200.out 200.s --strip-trailing-cr > 403.gcc.200.cmp', 'diff 403.gcc.c-typeck.out c-typeck.s --strip-trailing-cr > 403.gcc.c-typeck.cmp', 'diff 403.gcc.cp-decl.out cp-decl.s --strip-trailing-cr > 403.gcc.cp-decl.cmp', 'diff 403.gcc.expr.out expr.s --strip-trailing-cr > 403.gcc.expr.cmp', 'diff 403.gcc.expr2.out expr2.s --strip-trailing-cr > 403.gcc.expr2.cmp', 'diff 403.gcc.scilab.out scilab.s --strip-trailing-cr > 403.gcc.scilab.cmp']
 
 # This is the only required entry point to the module.
 test_class = SPEC2006_403_gcc

Modified: test-suite/trunk/LNTBased/speccpu2006/int/471.omnetpp/TestModule
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/LNTBased/speccpu2006/int/471.omnetpp/TestModule?rev=263315&r1=263314&r2=263315&view=diff
==============================================================================
--- test-suite/trunk/LNTBased/speccpu2006/int/471.omnetpp/TestModule (original)
+++ test-suite/trunk/LNTBased/speccpu2006/int/471.omnetpp/TestModule Fri Mar 11 18:52:02 2016
@@ -9,13 +9,13 @@ class SPEC2006_471_omnetpp(spec.TestModu
     benchmark = '471.omnetpp'
 
     train_input_set = ['train/input/omnetpp.ini']
-    train_output_set = []
+    train_output_set = ['train/output/omnetpp.log']
     train_args = ['omnetpp.ini > 471.omnetpp.input1.out 2> 471.omnetpp.input1.err']
-    train_cmp_cmds = ['']
+    train_cmp_cmds = ['diff 471.omnetpp.input1.out omnetpp.log --strip-trailing-cr > 471.omnetpp.input1.cmp']
     ref_input_set = ['ref/input/omnetpp.ini']
-    ref_output_set = []
+    ref_output_set = ['ref/output/omnetpp.log']
     ref_args = ['omnetpp.ini > 471.omnetpp.input1.out 2> 471.omnetpp.input1.err']
-    ref_cmp_cmds = []
+    ref_cmp_cmds = ['fpcmp -a 0.000001 -r 0.00001 471.omnetpp.input1.out omnetpp.log > 471.omnetpp.input1.cmp']
 
 # This is the only required entry point to the module.
 test_class = SPEC2006_471_omnetpp