commit f632d2014a9649790bf726c5fca8a56dcecad382
author Jon Hall <jhall@onlab.us> Thu Jul 30 15:45:11 2015 -0700
committer Jon Hall <jhall@onlab.us> Thu Jul 30 16:48:02 2015 -0700
tree a4169f0ff586ed4a81538aad019646bf72e9f2fa
parent e2f07866609e5fb30ee7a40461133136262ab063

More fixes for running teston from anywhere

Change-Id: I1c9ca56306698b00801cd9baccf9e1c55cf4ec25

TestON/tests/SAMPstartTemplate/SAMPstartTemplate.py

diff --git a/TestON/tests/SAMPstartTemplate/SAMPstartTemplate.py b/TestON/tests/SAMPstartTemplate/SAMPstartTemplate.py
index 96d24a9..464a0d3 100644
--- a/TestON/tests/SAMPstartTemplate/SAMPstartTemplate.py
+++ b/TestON/tests/SAMPstartTemplate/SAMPstartTemplate.py
@@ -11,6 +11,7 @@
         import time
         import os
         import imp
+        import re
 
         """
         - Construct tests variables
@@ -27,7 +28,7 @@
         stepResult = main.FALSE
 
         # Test variables
-        main.testOnDirectory = os.path.dirname( os.getcwd ( ) )
+        main.testOnDirectory = re.sub( "(/tests)$", "", main.testDir )
         main.cellName = main.params[ 'ENV' ][ 'cellName' ]
         main.apps = main.params[ 'ENV' ][ 'cellApps' ]
         gitBranch = main.params[ 'GIT' ][ 'branch' ]