Use do_run_from_file() for test_libgen

3 files changed, 53 insertions, 52 deletions

diff --git a/tests/core/test_libgen.in b/tests/core/test_libgen.in
new file mode 100644
index 00000000..c7918a78
--- /dev/null
+++ b/tests/core/test_libgen.in
@@ -0,0 +1,41 @@
+
+      #include <stdio.h>
+      #include <libgen.h>
+
+      int main() {
+        char p1[16] = "/usr/lib", p1x[16] = "/usr/lib";
+        printf("%s -> ", p1);
+        printf("%s : %s\n", dirname(p1x), basename(p1));
+
+        char p2[16] = "/usr", p2x[16] = "/usr";
+        printf("%s -> ", p2);
+        printf("%s : %s\n", dirname(p2x), basename(p2));
+
+        char p3[16] = "/usr/", p3x[16] = "/usr/";
+        printf("%s -> ", p3);
+        printf("%s : %s\n", dirname(p3x), basename(p3));
+
+        char p4[16] = "/usr/lib///", p4x[16] = "/usr/lib///";
+        printf("%s -> ", p4);
+        printf("%s : %s\n", dirname(p4x), basename(p4));
+
+        char p5[16] = "/", p5x[16] = "/";
+        printf("%s -> ", p5);
+        printf("%s : %s\n", dirname(p5x), basename(p5));
+
+        char p6[16] = "///", p6x[16] = "///";
+        printf("%s -> ", p6);
+        printf("%s : %s\n", dirname(p6x), basename(p6));
+
+        char p7[16] = "/usr/../lib/..", p7x[16] = "/usr/../lib/..";
+        printf("%s -> ", p7);
+        printf("%s : %s\n", dirname(p7x), basename(p7));
+
+        char p8[16] = "", p8x[16] = "";
+        printf("(empty) -> %s : %s\n", dirname(p8x), basename(p8));
+
+        printf("(null) -> %s : %s\n", dirname(0), basename(0));
+
+        return 0;
+      }
+      
\ No newline at end of file
diff --git a/tests/core/test_libgen.out b/tests/core/test_libgen.out
new file mode 100644
index 00000000..b29893a8
--- /dev/null
+++ b/tests/core/test_libgen.out
@@ -0,0 +1,9 @@
+/usr/lib -> /usr : lib
+/usr -> / : usr
+/usr/ -> / : usr
+/usr/lib/// -> /usr : lib
+/ -> / : /
+/// -> / : /
+/usr/../lib/.. -> /usr/../lib : ..
+(empty) -> . : .
+(null) -> . : .
diff --git a/tests/test_core.py b/tests/test_core.py
index ebc7a5eb..6d72da8e 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -3993,59 +3993,10 @@ def process(filename):
     self.do_run_from_file(src, output)
 
   def test_libgen(self):
-    src = r'''
-      #include <stdio.h>
-      #include <libgen.h>
-
-      int main() {
-        char p1[16] = "/usr/lib", p1x[16] = "/usr/lib";
-        printf("%s -> ", p1);
-        printf("%s : %s\n", dirname(p1x), basename(p1));
-
-        char p2[16] = "/usr", p2x[16] = "/usr";
-        printf("%s -> ", p2);
-        printf("%s : %s\n", dirname(p2x), basename(p2));
-
-        char p3[16] = "/usr/", p3x[16] = "/usr/";
-        printf("%s -> ", p3);
-        printf("%s : %s\n", dirname(p3x), basename(p3));
-
-        char p4[16] = "/usr/lib///", p4x[16] = "/usr/lib///";
-        printf("%s -> ", p4);
-        printf("%s : %s\n", dirname(p4x), basename(p4));
-
-        char p5[16] = "/", p5x[16] = "/";
-        printf("%s -> ", p5);
-        printf("%s : %s\n", dirname(p5x), basename(p5));
-
-        char p6[16] = "///", p6x[16] = "///";
-        printf("%s -> ", p6);
-        printf("%s : %s\n", dirname(p6x), basename(p6));
-
-        char p7[16] = "/usr/../lib/..", p7x[16] = "/usr/../lib/..";
-        printf("%s -> ", p7);
-        printf("%s : %s\n", dirname(p7x), basename(p7));
-
-        char p8[16] = "", p8x[16] = "";
-        printf("(empty) -> %s : %s\n", dirname(p8x), basename(p8));
-
-        printf("(null) -> %s : %s\n", dirname(0), basename(0));
+    test_path = path_from_root('tests', 'core', 'test_libgen')
+    src, output = (test_path + s for s in ('.in', '.out'))
 
-        return 0;
-      }
-      '''
-    expected = '''
-      /usr/lib -> /usr : lib
-      /usr -> / : usr
-      /usr/ -> / : usr
-      /usr/lib/// -> /usr : lib
-      / -> / : /
-      /// -> / : /
-      /usr/../lib/.. -> /usr/../lib : ..
-      (empty) -> . : .
-      (null) -> . : .
-    '''
-    self.do_run(src, re.sub('(^|\n)\s+', '\\1', expected))
+    self.do_run_from_file(src, output)
 
   def test_utime(self):
     src = open(path_from_root('tests', 'utime', 'test_utime.c'), 'r').read()