ext/libuv/test/test-fs-event.c in libuv-3.1.7 vs ext/libuv/test/test-fs-event.c in libuv-3.1.8

@@ -392,12 +392,12 @@
   uv_close((uv_handle_t*) (handles + 1), NULL);
   uv_close((uv_handle_t*) handle, NULL);
 }
 
 TEST_IMPL(fs_event_watch_dir) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
 
   uv_loop_t* loop = uv_default_loop();
   int r;
 
@@ -475,12 +475,12 @@
 #endif
 }
 
 
 TEST_IMPL(fs_event_watch_file) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
 
   uv_loop_t* loop = uv_default_loop();
   int r;
 
@@ -520,12 +520,12 @@
   /*
     This test watches a file named "file.jsx" and modifies a file named
     "file.js". The test verifies that no events occur for file.jsx.
   */
 
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
 
   uv_loop_t* loop;
   int r;
 
@@ -559,12 +559,12 @@
   MAKE_VALGRIND_HAPPY();
   return 0;
 }
 
 TEST_IMPL(fs_event_watch_file_twice) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
   const char path[] = "test/fixtures/empty_file";
   uv_fs_event_t watchers[2];
   uv_timer_t timer;
   uv_loop_t* loop;
@@ -583,12 +583,12 @@
   MAKE_VALGRIND_HAPPY();
   return 0;
 }
 
 TEST_IMPL(fs_event_watch_file_current_dir) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
   uv_timer_t timer;
   uv_loop_t* loop;
   int r;
 
@@ -656,12 +656,12 @@
   return 0;
 }
 #endif
 
 TEST_IMPL(fs_event_no_callback_after_close) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
 
   uv_loop_t* loop = uv_default_loop();
   int r;
 
@@ -694,12 +694,12 @@
   MAKE_VALGRIND_HAPPY();
   return 0;
 }
 
 TEST_IMPL(fs_event_no_callback_on_close) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
 
   uv_loop_t* loop = uv_default_loop();
   int r;
 
@@ -745,12 +745,12 @@
   uv_close((uv_handle_t*)handle, close_cb);
 }
 
 
 TEST_IMPL(fs_event_immediate_close) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
   uv_timer_t timer;
   uv_loop_t* loop;
   int r;
 
@@ -770,12 +770,12 @@
   return 0;
 }
 
 
 TEST_IMPL(fs_event_close_with_pending_event) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
   uv_loop_t* loop;
   int r;
 
   loop = uv_default_loop();
@@ -816,12 +816,12 @@
     uv_close((uv_handle_t*) handle, close_cb);
   }
 }
 
 TEST_IMPL(fs_event_close_in_callback) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
   uv_loop_t* loop;
   int r;
 
   loop = uv_default_loop();
@@ -855,12 +855,12 @@
   MAKE_VALGRIND_HAPPY();
   return 0;
 }
 
 TEST_IMPL(fs_event_start_and_close) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
   uv_loop_t* loop;
   uv_fs_event_t fs_event1;
   uv_fs_event_t fs_event2;
   int r;
@@ -890,12 +890,12 @@
   MAKE_VALGRIND_HAPPY();
   return 0;
 }
 
 TEST_IMPL(fs_event_getpath) {
-#if defined(__MVS__)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
   uv_loop_t* loop = uv_default_loop();
   int r;
   char buf[1024];
   size_t len;
@@ -1027,11 +1027,11 @@
 }
 
 #endif  /* defined(__APPLE__) */
 
 TEST_IMPL(fs_event_watch_invalid_path) {
-#if defined(MVS)
-  RETURN_SKIP("Filesystem watching not supported on this platform.");
+#if defined(NO_FS_EVENTS)
+  RETURN_SKIP(NO_FS_EVENTS);
 #endif
 
   uv_loop_t* loop;
   int r;