From 69c105fed16b20ade2f34936949cae8d60c9e15c Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 1 Aug 2011 19:45:32 +0000
Subject: 2011-08-01	Joel Sherrill <joel.sherrill@oarcorp.com>

	* check_submission: Time tests do not need .scn files.
---
 merge-helpers/ChangeLog        |  4 ++++
 merge-helpers/check_submission | 23 ++++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'merge-helpers')

diff --git a/merge-helpers/ChangeLog b/merge-helpers/ChangeLog
index 6a9b760..f78c597 100644
--- a/merge-helpers/ChangeLog
+++ b/merge-helpers/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-01	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* check_submission: Time tests do not need .scn files.
+
 2011-08-01	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* check_submission: Check for missing .doc and .scn files.
diff --git a/merge-helpers/check_submission b/merge-helpers/check_submission
index 370539d..d8ade2d 100755
--- a/merge-helpers/check_submission
+++ b/merge-helpers/check_submission
@@ -239,19 +239,24 @@ if [ ${do_test} = "yes" ] ; then
   echo "=== Checking for missing test support files"
   for m in ${Makefiles}
   do
-    testName=`dirname ${m}`
-    if [ ${testName} = "." ] ; then
-      testName=`pwd`
+    directory=`dirname ${m}`
+    if [ ${directory} = "." ] ; then
+      directory=`pwd`
     fi
-    testName=`basename ${testName}`
+    testName=`basename ${directory}`
     # Does this test have a .doc file?
-    if [ ! -r ${testName}.doc ] ; then
+    if [ ! -r ${directory}/${testName}.doc ] ; then
       echo ${testName}.doc is not present
     fi
-    # Does this test have a .scn file?
-    if [ ! -r ${testName}.scn ] ; then
-      echo ${testName}.scn is not present
-    fi
+    case ${directory} in
+      */*tmtests*) ;;
+      *)
+        # Does this test have a .scn file?
+        if [ ! -r ${directory}/${testName}.scn ] ; then
+          echo ${testName}.scn is not present
+        fi
+        ;;
+    esac
   done
       
 fi
-- 
cgit v1.2.3