Fixing the logic for testing if output files are created and if they are empty etc.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@2782 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 12 insertions, 5 deletions

diff --git a/lib/sbin/RunTestUtils.pl b/lib/sbin/RunTestUtils.pl
index 5d1c1c92..c7814e69 100644
--- a/lib/sbin/RunTestUtils.pl
+++ b/lib/sbin/RunTestUtils.pl
@@ -950,15 +950,22 @@ sub CompareTestFiles
       } #while
 
     }
-    elsif (-e $newfile && -z $oldfile && -s $newfile)
+    elsif (!-e $newfile && -s $oldfile)
     {
-      print "     $file in archive but not in test\n";
+      print "     $file in archive but not created in test\n";
+      $rundata->{"$inthorn $test NFAILWEAK"}++;
+      $rundata->{"$inthorn $test NFAILSTRONG"}++;
+    }
+    elsif (!-e $newfile && -z $oldfile)
+    {
+      print "     $file in archive but not created in test\n";
+      print "       ($file empty in archive)\n";
       $rundata->{"$inthorn $test NFAILWEAK"}++;
       $rundata->{"$inthorn $test NFAILSTRONG"}++;
     }
     elsif (-e $newfile && -s $oldfile && -z $newfile)
     {
-      print "     $file is empty\n";
+      print "     $file is empty in test\n";
       $rundata->{"$inthorn $test NFAILWEAK"}++;
       $rundata->{"$inthorn $test NFAILSTRONG"}++;
     }
@@ -966,9 +973,9 @@ sub CompareTestFiles
     {
       print "     $file empty in both test and archive\n";
     }
-    elsif (-e $newfile && -s $oldfile && -s $newfile)      
+    elsif (-e $newfile && -z $oldfile && -s $newfile)      
     {
-      print "     $file not created for comparison\n";
+      print "     $file is empty in archive but not in test\n";
       $rundata->{"$inthorn $test NFAILWEAK"}++;
       $rundata->{"$inthorn $test NFAILSTRONG"}++;
     }