The very preliminary test driver now runs correctly

1 files changed, 13 insertions, 7 deletions

diff --git a/test_driver/test.py b/test_driver/test.py
index 236f52e..68fdafb 100644
--- a/test_driver/test.py
+++ b/test_driver/test.py
@@ -9,18 +9,21 @@ liblitmus_dir = '/root/liblitmus/'
 ft_trace_dir = '/root/ft_trace/'
 
 #device files directory
-#You should put the make_devices program into this directory, and chmod +x it.
 device_dir = '/root/device_files/'
 
 #desired scheduling policy
 #options listed in /proc/litmus/plugins
 policy = 'GSN-EDF'
 
+#Additional instructions:
+#    -Make sure you've chmod +x'd the make_devices file and kept it in the same
+#       dir as test.py
 
 ###########
 # Imports #
 ###########
 
+import subprocess 
 import os
 
 
@@ -30,17 +33,20 @@ import os
 
 def main():
 
+    #Determine directory of test.py
+    test_dir = os.getcwd()
+
     #Set scheduling policy
-    os.system('cat ' + policy + ' > ' + '/proc/litmus/active_policy')
+    subprocess.Popen('echo ' + policy + ' > ' + '/proc/litmus/active_plugin',
+                     shell=True)
 
     #Setup the device files for the traces
-    os.system(device_dir + 'make_devices')
+    subprocess.Popen('chmod +x make_devices',shell=True)
+    subprocess.Popen(test_dir + '/make_devices',cwd=device_dir)
 
     #Set up environment variables needed for st_trace script
-    os.system('FTCAT=' + ft_trace_dir + 'ftcat')
-    os.system('FTDEV=' + device_dir)
-    os.system('export FTCAT')
-    os.system('export FTDEV')
+    os.putenv('FTCAT', ft_trace_dir + 'ftcat')
+    os.putenv('FTDEV',device_dir)
 
     #Current steps...
     #Run st_trace