Print commands to be executed by cli_driver.py

[apitrace-tests] / cli_driver.py

diff --git a/cli_driver.py b/cli_driver.py
index a7f4b3d5212a67821e636715140c8bc5e5d0c5f9..d4d277d33e822f7e8f4ff9dc75f25c92eec335e4 100644 (file)
--- a/cli_driver.py
+++ b/cli_driver.py
@@ -33,6 +33,7 @@ class CliDriver(Driver):
     def do_apitrace(self, args):
         cmd = [self.options.apitrace] + args[1:]
  
+        print " ".join(cmd)
         proc = subprocess.Popen(cmd, stdout = subprocess.PIPE)
         self.output = proc.communicate()[0]
 
@@ -83,12 +84,14 @@ class CliDriver(Driver):
 
             line = script.readline()
 
+            # Exit loop on EOF
             if (line == ''):
                 break
 
             cmd = line.split()
 
-            if (len(cmd) == 0):
+            # Ignore blank lines and comments
+            if (len(cmd) == 0 or line[0] == '#'):
                 continue
 
             if (cmd[0] == 'EXPECT_FAILURE:'):