Changeset 2089 for trunk/src/libctests/glibc/stdlib/test-canon.c

Timestamp:

Jun 27, 2005, 5:05:29 AM (20 years ago)

Author:

bird

Message:

testcase adjustments.

File:

• trunk/src/libctests/glibc/stdlib/test-canon.c (modified) (4 diffs, 1 prop)

trunk/src/libctests/glibc/stdlib/test-canon.c

@@ -112 +112 @@
             && strcmp (result + cwd_len, expected + 1) == 0);
   else
-    good = (strcmp (expected, result) == 0);
+    {
+      good = (strcmp (expected, result) == 0);
+#ifdef __EMX__
+      if (!good && expected[0] == '/' && result[1] == ':' && result[2] == '/')
+        good = (strcmp (expected, result + 2) == 0);
+#endif
+    }
 
   return good;
@@ -158 +164 @@
     symlink (symlinks[i].value, symlinks[i].name);
 
+  int rmdir_etc = mkdir ("/etc", 0777) == 0;
+
   int has_dir = mkdir ("doesExist", 0777) == 0;
 
@@ -213 +221 @@
     }
 
+#ifdef __EMX__
+  if (fd >= 0) /* cannot unlink open files */
+    close (fd);
+#endif
   if (fd >= 0)
     unlink ("doesExist/someFile");
@@ -218 +230 @@
   if (has_dir)
     rmdir ("doesExist");
+
+  if (rmdir_etc)
+    rmdir ("/etc");
 
   for (i = 0; i < (int) (sizeof (symlinks) / sizeof (symlinks[0])); ++i)