[MOD] Move bash files into their own folder

nathanrosspowell · Jan 24, 2012 · 56c41f4 · 56c41f4
1 parent 4147c92
commit 56c41f4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/testing/cleanup.bash → testing/bash/cleanup.bash b/testing/cleanup.bash → testing/bash/cleanup.bash
diff --git a/testing/cpp.bash → testing/bash/cpp.bash b/testing/cpp.bash → testing/bash/cpp.bash
diff --git a/testing/haskell.bash → testing/bash/haskell.bash b/testing/haskell.bash → testing/bash/haskell.bash
diff --git a/testing/python.bash → testing/bash/python.bash b/testing/python.bash → testing/bash/python.bash
diff --git a/testing/run.py b/testing/run.py
@@ -98,13 +98,14 @@ def run( self ):
         else:
             print "Error", status, output, self.answer, self.language
         args = "%s %s" %  os.path.split( self.problemPath )
-        os.system( self.cleanUp % ( self.folders.path, args ) )
+        os.system( self.cleanUp % ( os.path.join( self.folders.path, "bash" ), args ) )
 
 class ExecuteCpp( Execute ):
     def createCmd( self ):
         folder, fileName = os.path.split( self.problemPath )
         args = "%s %s" % ( folder, self.problemPath )
-        bash = os.path.join( self.folders.path, self.language )
+        bashFolder = os.path.join( self.folders.path, "bash" )
+        bash = os.path.join( bashFolder, self.language )
         self.cmd = self.bashFormat % ( bash, args )
 
 ExecutePython = ExecuteCpp
@@ -113,7 +114,8 @@ class ExecuteHaskell( Execute ):
     def createCmd( self ):
         folder, fileName = os.path.split( self.problemPath )
         args = "%s %s %.4d.o" % ( folder, self.problemPath, self.problemNumber )
-        bash = os.path.join( self.folders.path, self.language )
+        bashFolder = os.path.join( self.folders.path, "bash" )
+        bash = os.path.join( bashFolder, self.language )
         self.cmd = self.bashFormat % ( bash, args )
 
 def createExecInstance( folders, **kwargs ):