Fix test-module-load-list for use-uv

indutny · Jul 28, 2011 · 799c7bd · 799c7bd
1 parent 8527f00
commit 799c7bd
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -166,6 +166,7 @@ UVTEST += simple/test-next-tick-errors
 UVTEST += simple/test-next-tick-ordering
 UVTEST += simple/test-next-tick-ordering2
 UVTEST += simple/test-next-tick-starvation
+UVTEST += simple/test-module-load-list
 UVTEST += simple/test-path
 UVTEST += simple/test-pipe-stream
 UVTEST += simple/test-pump-file2tcp

diff --git a/test/simple/test-module-load-list.js b/test/simple/test-module-load-list.js
@@ -58,18 +58,33 @@ checkExpected();
 // Now do the test again after we console.log something.
 console.log("load console.log");
 
-expected = expected.concat([
-  'NativeModule console',
-  'NativeModule net_legacy',
-  'NativeModule timers_legacy',
-  'Binding timer',
-  'NativeModule _linklist',
-  'Binding net',
-  'NativeModule freelist',
-  'Binding io_watcher',
-  'NativeModule tty',
-  'NativeModule tty_posix', // FIXME branch on win32 here.
-]);
+if (!process.features.uv)  {
+  expected = expected.concat([
+    'NativeModule console',
+    'NativeModule net_legacy',
+    'NativeModule timers_legacy',
+    'Binding timer',
+    'NativeModule _linklist',
+    'Binding net',
+    'NativeModule freelist',
+    'Binding io_watcher',
+    'NativeModule tty',
+    'NativeModule tty_posix', // FIXME branch on win32 here.
+  ]);
+} else {
+  expected = expected.concat([
+    'NativeModule console',
+    'NativeModule net_legacy',
+    'NativeModule timers_uv',
+    'Binding timer_wrap',
+    'NativeModule _linklist',
+    'Binding net',
+    'NativeModule freelist',
+    'Binding io_watcher',
+    'NativeModule tty',
+    'NativeModule tty_posix' 
+  ]);
+}
 
 checkExpected();