Use do_run_from_file() for test_i64_cmp

3 files changed, 22 insertions, 19 deletions

diff --git a/tests/core/test_i64_cmp.in b/tests/core/test_i64_cmp.in
new file mode 100644
index 00000000..b967d2ff
--- /dev/null
+++ b/tests/core/test_i64_cmp.in
@@ -0,0 +1,18 @@
+
+        #include <stdio.h>
+
+        typedef long long int64;
+
+        bool compare(int64 val) {
+          return val == -12;
+        }
+
+        bool compare2(int64 val) {
+          return val < -12;
+        }
+
+        int main(int argc, char * argv[]) {
+            printf("*%d,%d,%d,%d,%d,%d*\n", argc, compare(argc-1-12), compare(1000+argc), compare2(argc-1-10), compare2(argc-1-14), compare2(argc+1000));
+            return 0;
+        }
+      
\ No newline at end of file
diff --git a/tests/core/test_i64_cmp.out b/tests/core/test_i64_cmp.out
new file mode 100644
index 00000000..6474e7f5
--- /dev/null
+++ b/tests/core/test_i64_cmp.out
@@ -0,0 +1 @@
+*1,1,0,0,1,0*
diff --git a/tests/test_core.py b/tests/test_core.py
index 48624464..319ecda6 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -272,26 +272,10 @@ class T(RunnerCore): # Short name, to make it more fun to use manually on the co
   def test_i64_cmp(self):
       if Settings.USE_TYPED_ARRAYS != 2: return self.skip('full i64 stuff only in ta2')
 
-      src = r'''
-        #include <stdio.h>
-
-        typedef long long int64;
-
-        bool compare(int64 val) {
-          return val == -12;
-        }
-
-        bool compare2(int64 val) {
-          return val < -12;
-        }
-
-        int main(int argc, char * argv[]) {
-            printf("*%d,%d,%d,%d,%d,%d*\n", argc, compare(argc-1-12), compare(1000+argc), compare2(argc-1-10), compare2(argc-1-14), compare2(argc+1000));
-            return 0;
-        }
-      '''
+      test_path = path_from_root('tests', 'core', 'test_i64_cmp')
+      src, output = (test_path + s for s in ('.in', '.out'))
 
-      self.do_run(src, '*1,1,0,0,1,0*\n')
+      self.do_run_from_file(src, output)
 
   def test_i64_cmp2(self):
       if Settings.USE_TYPED_ARRAYS != 2: return self.skip('full i64 stuff only in ta2')