From fc617190c9940a11bd66acdfd65a5d3bc1a732ed Mon Sep 17 00:00:00 2001
From: Nicholas Malaya <nicholas.malaya@gmail.com>
Date: Tue, 7 Feb 2012 16:56:09 +0000
Subject: [PATCH] [cantera]: adding negAtest and skipping nasa9 reader for now

---
 configure.ac                                       | 3 +++
 test_problems/Makefile.am                          | 7 ++++---
 test_problems/nasa9_reader/Makefile.am             | 1 +
 test_problems/nasa9_reader/{runtest.in => runtest} | 2 ++
 test_problems/negATest/runtest                     | 2 ++
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 test_problems/nasa9_reader/Makefile.am
 rename test_problems/nasa9_reader/{runtest.in => runtest} (98%)

diff --git a/configure.ac b/configure.ac
index eafa164bd..d5a980252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,7 @@ AC_OUTPUT(Makefile                                                         \
                    test_problems/diamondSurf_dupl/Makefile                 \
                    test_problems/fracCoeff/Makefile                        \
                    test_problems/multiGasTransport/Makefile                \
+                   test_problems/negATest/Makefile                         \
                    test_problems/NASA9poly_test/Makefile                   \
                    test_problems/cathermo/Makefile                         \
                    test_problems/cathermo/DH_graph_1/Makefile              \
@@ -152,7 +153,9 @@ AC_OUTPUT(Makefile                                                         \
                    examples/Makefile                                       \
 		   examples/cxx/Makefile)                                   
 
+# skipped tests
 #                   test_problems/ck2cti/Makefile                         
+#                   test_problems/nasa9_reader/Makefile                     
 
 
 # FINAL SUMMARY
diff --git a/test_problems/Makefile.am b/test_problems/Makefile.am
index 12438679c..4de188647 100644
--- a/test_problems/Makefile.am
+++ b/test_problems/Makefile.am
@@ -1,12 +1,13 @@
 
 #SUBDIRS    = surfkin silane_equil VPsilance_test \
-	     negATest diamondSurf_dupl surfSolverTest \
+	     diamondSurf_dupl surfSolverTest \
              ChemEquil_gri_matrix ChemEquil_gri_pairs             \
 	     mixGasTransport printUtilUnitTest 
 
 SUBDIRS  = cathermo mixGasTransport ChemEquil_gri_matrix ChemEquil_gri_pairs
 SUBDIRS += ChemEquil_ionizedGas ChemEquil_red1 CpJump cxx_ex diamondSurf 
 SUBDIRS += diamondSurf_dupl fracCoeff multiGasTransport NASA9poly_test
+SUBDIRS += negATest 
 
 #
 # would be good to add:
@@ -15,14 +16,14 @@ SUBDIRS += diamondSurf_dupl fracCoeff multiGasTransport NASA9poly_test
 # rankine_democxx
 # min_python
 # 
-# nasa9_reader
+# 
 # cathermo
 # VCSnonideal
 
 
 # skipped:
 # ck2cti_test
-
+# nasa9_reader (uses ck2cti)
 
 EXTRA_DIST =
 
diff --git a/test_problems/nasa9_reader/Makefile.am b/test_problems/nasa9_reader/Makefile.am
new file mode 100644
index 000000000..1773e7087
--- /dev/null
+++ b/test_problems/nasa9_reader/Makefile.am
@@ -0,0 +1 @@
+TESTS = runtest
\ No newline at end of file
diff --git a/test_problems/nasa9_reader/runtest.in b/test_problems/nasa9_reader/runtest
similarity index 98%
rename from test_problems/nasa9_reader/runtest.in
rename to test_problems/nasa9_reader/runtest
index 2811d162e..a7df09c83 100755
--- a/test_problems/nasa9_reader/runtest.in
+++ b/test_problems/nasa9_reader/runtest
@@ -30,6 +30,7 @@ retnStat=$?
 if [ $retnStat = "0" ]
 then
   echo "Successful diff comparison on ck2cti test (nasa9_reader/sample.inp)"
+  return 0
 else
   echo "########################################################"
   echo "Unsuccessful diff comparison on ck2cti test (nasa9_reader/sample.inp)"
@@ -38,4 +39,5 @@ else
   echo "       test_problems/nasa9_reader/sampleb.cti"
   echo "       test_problems/nasa9_reader/sample_blessed.cti"
   echo "########################################################"
+  return 1
 fi
diff --git a/test_problems/negATest/runtest b/test_problems/negATest/runtest
index 2bce01d44..922586252 100755
--- a/test_problems/negATest/runtest
+++ b/test_problems/negATest/runtest
@@ -26,9 +26,11 @@ retnStat=$?
 if [ $retnStat = "0" ]
 then
   echo "successful diff comparison on $testName test"
+  return 0
 else
   echo "unsuccessful diff comparison on $testName test"
   echo "FAILED" > csvCode.txt
   temp_success="1"
+  return 1
 fi
 #