Use do_run_from_file() for test_longjmp

3 files changed, 41 insertions, 34 deletions

diff --git a/tests/core/test_longjmp.in b/tests/core/test_longjmp.in
new file mode 100644
index 00000000..4260ed15
--- /dev/null
+++ b/tests/core/test_longjmp.in
@@ -0,0 +1,34 @@
+
+        #include <stdio.h>
+        #include <setjmp.h>
+
+        static jmp_buf buf;
+
+        void second(void) {
+            printf("second\n");
+            longjmp(buf,-1);
+        }
+
+        void first(void) {
+            printf("first\n");                         // prints
+            longjmp(buf,1);                            // jumps back to where setjmp was called - making setjmp now return 1
+        }
+
+        int main() {
+            volatile int x = 0;
+            int jmpval = setjmp(buf);
+            if (!jmpval) {
+                x++;                                   // should be properly restored once longjmp jumps back
+                first();                               // when executed, setjmp returns 1
+                printf("skipped\n");                   // does not print
+            } else if (jmpval == 1) {                  // when first() jumps back, setjmp returns 1
+                printf("result: %d %d\n", x, jmpval);  // prints
+                x++;
+                second();                              // when executed, setjmp returns -1
+            } else if (jmpval == -1) {                 // when second() jumps back, setjmp returns -1
+                printf("result: %d %d\n", x, jmpval);  // prints
+            }
+
+            return 0;
+        }
+      
\ No newline at end of file
diff --git a/tests/core/test_longjmp.out b/tests/core/test_longjmp.out
new file mode 100644
index 00000000..4a412fef
--- /dev/null
+++ b/tests/core/test_longjmp.out
@@ -0,0 +1,4 @@
+first
+result: 1 1
+second
+result: 2 -1
\ No newline at end of file
diff --git a/tests/test_core.py b/tests/test_core.py
index befd66ba..9646f09b 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -1086,41 +1086,10 @@ class T(RunnerCore): # Short name, to make it more fun to use manually on the co
       self.do_run_from_file(src, output)
 
   def test_longjmp(self):
-      src = r'''
-        #include <stdio.h>
-        #include <setjmp.h>
-
-        static jmp_buf buf;
-
-        void second(void) {
-            printf("second\n");
-            longjmp(buf,-1);
-        }
-
-        void first(void) {
-            printf("first\n");                         // prints
-            longjmp(buf,1);                            // jumps back to where setjmp was called - making setjmp now return 1
-        }
-
-        int main() {
-            volatile int x = 0;
-            int jmpval = setjmp(buf);
-            if (!jmpval) {
-                x++;                                   // should be properly restored once longjmp jumps back
-                first();                               // when executed, setjmp returns 1
-                printf("skipped\n");                   // does not print
-            } else if (jmpval == 1) {                  // when first() jumps back, setjmp returns 1
-                printf("result: %d %d\n", x, jmpval);  // prints
-                x++;
-                second();                              // when executed, setjmp returns -1
-            } else if (jmpval == -1) {                 // when second() jumps back, setjmp returns -1
-                printf("result: %d %d\n", x, jmpval);  // prints
-            }
+      test_path = path_from_root('tests', 'core', 'test_longjmp')
+      src, output = (test_path + s for s in ('.in', '.out'))
 
-            return 0;
-        }
-      '''
-      self.do_run(src, 'first\nresult: 1 1\nsecond\nresult: 2 -1')
+      self.do_run_from_file(src, output)
 
   def test_longjmp2(self):
     src = r'''