Changeset 122

Timestamp:

03/02/08 19:21:47 (10 months ago)

Author:

iteman

Message:

- Added support for autotest by -a option. (Ticket #10)

Location:

trunk/src/Stagehand

Files:

• TestRunner.php (modified) (4 diffs)
• TestRunner/AlterationMonitor.php (added)

trunk/src/Stagehand/TestRunner.php

@@ -37 +37 @@
 
 require_once 'Console/Getopt.php';
+require_once 'Stagehand/TestRunner/AlterationMonitor.php';
 
 // {{{ Stagehand_TestRunner
@@ -161 +162 @@
             $runner->run($suite, $color);
         } else {
-            if (php_uname('s') !== 'Windows NT') {
-                echo "ERROR: -a option is not supported for your platform.\n";
-                self::_displayUsage();
-                return 1;
-            }
-
             $directory = realpath($directory);
             if ($directory === false || !is_dir($directory)) {
@@ -211 +206 @@
             $options[] = $directory;
 
-            define('FILE_NOTIFY_CHANGE_FILE_NAME',    0x00000001);
-            define('FILE_NOTIFY_CHANGE_DIR_NAME',     0x00000002);
-            define('FILE_NOTIFY_CHANGE_ATTRIBUTES',   0x00000004);
-            define('FILE_NOTIFY_CHANGE_SIZE',         0x00000008);
-            define('FILE_NOTIFY_CHANGE_LAST_WRITE',   0x00000010);
-            define('FILE_NOTIFY_CHANGE_LAST_ACCESS',  0x00000020);
-            define('FILE_NOTIFY_CHANGE_CREATION',     0x00000040);
-            define('FILE_NOTIFY_CHANGE_EA',           0x00000080);
-            define('FILE_NOTIFY_CHANGE_SECURITY',     0x00000100);
-            define('FILE_NOTIFY_CHANGE_STREAM_NAME',  0x00000200);
-            define('FILE_NOTIFY_CHANGE_STREAM_SIZE',  0x00000400);
-            define('FILE_NOTIFY_CHANGE_STREAM_WRITE', 0x00000800);
-            define('INFINITE', 0xffffffff);
-
-            $kernel32 = wb_load_library('kernel32.dll');
-            while (true) {
-                $h1 = wb_call_function(wb_get_function_address('FindFirstChangeNotification', $kernel32),
-                                       array($directory,
-                                             1,
-                                             FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_EA | FILE_NOTIFY_CHANGE_SECURITY)
-                                       );
-
-                print "Waiting for changes in the directory [ $directory ] ...\n";
-                $h2 = wb_call_function(wb_get_function_address('WaitForSingleObject', $kernel32),
-                                       array($h1, INFINITE)
-                                       );
-                passthru("$command " . implode(' ', $options), $result);
-
-                $h3 = wb_call_function(wb_get_function_address('FindCloseChangeNotification', $kernel32),
-                                       array($h1)
-                                       );
-
-                if ($result !== 0) {
-                    return 1;
-                }
+            $monitor = new Stagehand_TestRunner_AlterationMonitor($directory, "$command " . implode(' ', $options));
+
+            try {
+                $monitor->monitor();
+            } catch (Stagehand_TestRunner_Exception $e) {
+                echo 'ERROR: ' . $e->getMessage() . "\n";
+                return 1;
             }
         }
@@ -281 +248 @@
   -c        color the result of a test runner run
   -p <file> preload <file> as a PHP script
-  -a        watch for changes in a specified directory and run all tests in
+  -a        watch for changes in a specified directory and run tests in
             the directory recursively when changes are detected (autotest)