Use do_run_from_file() for test_varargs

3 files changed, 122 insertions, 117 deletions

diff --git a/tests/core/test_varargs.in b/tests/core/test_varargs.in
new file mode 100644
index 00000000..d169c151
--- /dev/null
+++ b/tests/core/test_varargs.in
@@ -0,0 +1,103 @@
+
+        #include <stdio.h>
+        #include <stdarg.h>
+
+        void vary(const char *s, ...)
+        {
+          va_list v;
+          va_start(v, s);
+          char d[20];
+          vsnprintf(d, 20, s, v);
+          puts(d);
+
+          // Try it with copying
+          va_list tempva;
+          va_copy(tempva, v);
+          vsnprintf(d, 20, s, tempva);
+          puts(d);
+
+          va_end(v);
+        }
+
+        void vary2(char color, const char *s, ...)
+        {
+          va_list v;
+          va_start(v, s);
+          char d[21];
+          d[0] = color;
+          vsnprintf(d+1, 20, s, v);
+          puts(d);
+          va_end(v);
+        }
+        
+        void varargs_listoffsets_list_evaluate(int count, va_list ap, int vaIteration)
+        {
+          while(count > 0)
+          {
+              const char* string = va_arg(ap, const char*);
+              printf("%s", string);
+              count--;
+          }
+          printf("\n");
+        }
+          
+        void varags_listoffsets_list_copy(int count, va_list ap, int iteration)
+        {
+          va_list ap_copy;
+          va_copy(ap_copy, ap);
+          varargs_listoffsets_list_evaluate(count, ap_copy, iteration);
+          va_end(ap_copy);
+        }
+          
+        void varargs_listoffsets_args(int type, int count, ...)
+        {
+          va_list ap;
+          va_start(ap, count);
+          
+          // evaluate a copied list
+          varags_listoffsets_list_copy(count, ap, 1);
+          varags_listoffsets_list_copy(count, ap, 2);
+          varags_listoffsets_list_copy(count, ap, 3);
+          varags_listoffsets_list_copy(count, ap, 4);
+          
+          varargs_listoffsets_list_evaluate(count, ap, 1);
+          
+          // NOTE: we expect this test to fail, so we will check the stdout for <BAD+0><BAD+1>.....
+          varargs_listoffsets_list_evaluate(count, ap, 2);
+          
+          // NOTE: this test has to work again, as we restart the list
+          va_end(ap);
+          va_start(ap, count);
+          varargs_listoffsets_list_evaluate(count, ap, 3);
+          va_end(ap);
+        }
+        
+        void varargs_listoffsets_main()
+        {
+          varargs_listoffsets_args(0, 5, "abc", "def", "ghi", "jkl", "mno", "<BAD+0>", "<BAD+1>", "<BAD+2>", "<BAD+3>", "<BAD+4>", "<BAD+5>", "<BAD+6>", "<BAD+7>", "<BAD+8>", "<BAD+9>", "<BAD+10>", "<BAD+11>", "<BAD+12>", "<BAD+13>", "<BAD+14>", "<BAD+15>", "<BAD+16>");
+        }
+
+        #define GETMAX(pref, type)           type getMax##pref(int num, ...)           {             va_list vv;             va_start(vv, num);             type maxx = va_arg(vv, type);             for (int i = 1; i < num; i++)             {               type curr = va_arg(vv, type);               maxx = curr > maxx ? curr : maxx;             }             va_end(vv);             return maxx;           }
+        GETMAX(i, int);
+        GETMAX(D, double);
+
+        int main(int argc, char **argv) {
+          vary("*cheez: %d+%d*", 0, 24); // Also tests that '0' is not special as an array ender
+          vary("*albeit*"); // Should not fail with no var args in vararg function
+          vary2('Q', "%d*", 85);
+
+          int maxxi = getMaxi(6,        2, 5, 21, 4, -10, 19);
+          printf("maxxi:%d*\n", maxxi);
+          double maxxD = getMaxD(6,        (double)2.1, (double)5.1, (double)22.1, (double)4.1, (double)-10.1, (double)19.1, (double)2);
+          printf("maxxD:%.2f*\n", (float)maxxD);
+
+          // And, as a function pointer
+          void (*vfp)(const char *s, ...) = argc == 1211 ? NULL : vary;
+          vfp("*vfp:%d,%d*", 22, 199);
+
+          // ensure lists work properly when copied, reinited etc.
+          varargs_listoffsets_main();
+
+          return 0;
+        }
+        
\ No newline at end of file
diff --git a/tests/core/test_varargs.out b/tests/core/test_varargs.out
new file mode 100644
index 00000000..42a30d74
--- /dev/null
+++ b/tests/core/test_varargs.out
@@ -0,0 +1,16 @@
+*cheez: 0+24*
+*cheez: 0+24*
+*albeit*
+*albeit*
+Q85*
+maxxi:21*
+maxxD:22.10*
+*vfp:22,199*
+*vfp:22,199*
+abcdefghijklmno
+abcdefghijklmno
+abcdefghijklmno
+abcdefghijklmno
+abcdefghijklmno
+<BAD+0><BAD+1><BAD+2><BAD+3><BAD+4>
+abcdefghijklmno
diff --git a/tests/test_core.py b/tests/test_core.py
index 22e19c83..714254e4 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -2086,124 +2086,10 @@ def process(filename):
       if Settings.QUANTUM_SIZE == 1: return self.skip('FIXME: Add support for this')
       if not self.is_le32(): return self.skip('we do not support all varargs stuff without le32')
 
-      src = '''
-        #include <stdio.h>
-        #include <stdarg.h>
-
-        void vary(const char *s, ...)
-        {
-          va_list v;
-          va_start(v, s);
-          char d[20];
-          vsnprintf(d, 20, s, v);
-          puts(d);
-
-          // Try it with copying
-          va_list tempva;
-          va_copy(tempva, v);
-          vsnprintf(d, 20, s, tempva);
-          puts(d);
-
-          va_end(v);
-        }
-
-        void vary2(char color, const char *s, ...)
-        {
-          va_list v;
-          va_start(v, s);
-          char d[21];
-          d[0] = color;
-          vsnprintf(d+1, 20, s, v);
-          puts(d);
-          va_end(v);
-        }
-        
-        void varargs_listoffsets_list_evaluate(int count, va_list ap, int vaIteration)
-        {
-          while(count > 0)
-          {
-              const char* string = va_arg(ap, const char*);
-              printf("%s", string);
-              count--;
-          }
-          printf("\\n");
-        }
-          
-        void varags_listoffsets_list_copy(int count, va_list ap, int iteration)
-        {
-          va_list ap_copy;
-          va_copy(ap_copy, ap);
-          varargs_listoffsets_list_evaluate(count, ap_copy, iteration);
-          va_end(ap_copy);
-        }
-          
-        void varargs_listoffsets_args(int type, int count, ...)
-        {
-          va_list ap;
-          va_start(ap, count);
-          
-          // evaluate a copied list
-          varags_listoffsets_list_copy(count, ap, 1);
-          varags_listoffsets_list_copy(count, ap, 2);
-          varags_listoffsets_list_copy(count, ap, 3);
-          varags_listoffsets_list_copy(count, ap, 4);
-          
-          varargs_listoffsets_list_evaluate(count, ap, 1);
-          
-          // NOTE: we expect this test to fail, so we will check the stdout for <BAD+0><BAD+1>.....
-          varargs_listoffsets_list_evaluate(count, ap, 2);
-          
-          // NOTE: this test has to work again, as we restart the list
-          va_end(ap);
-          va_start(ap, count);
-          varargs_listoffsets_list_evaluate(count, ap, 3);
-          va_end(ap);
-        }
-        
-        void varargs_listoffsets_main()
-        {
-          varargs_listoffsets_args(0, 5, "abc", "def", "ghi", "jkl", "mno", "<BAD+0>", "<BAD+1>", "<BAD+2>", "<BAD+3>", "<BAD+4>", "<BAD+5>", "<BAD+6>", "<BAD+7>", "<BAD+8>", "<BAD+9>", "<BAD+10>", "<BAD+11>", "<BAD+12>", "<BAD+13>", "<BAD+14>", "<BAD+15>", "<BAD+16>");
-        }
-
-        #define GETMAX(pref, type) \
-          type getMax##pref(int num, ...) \
-          { \
-            va_list vv; \
-            va_start(vv, num); \
-            type maxx = va_arg(vv, type); \
-            for (int i = 1; i < num; i++) \
-            { \
-              type curr = va_arg(vv, type); \
-              maxx = curr > maxx ? curr : maxx; \
-            } \
-            va_end(vv); \
-            return maxx; \
-          }
-        GETMAX(i, int);
-        GETMAX(D, double);
-
-        int main(int argc, char **argv) {
-          vary("*cheez: %d+%d*", 0, 24); // Also tests that '0' is not special as an array ender
-          vary("*albeit*"); // Should not fail with no var args in vararg function
-          vary2('Q', "%d*", 85);
-
-          int maxxi = getMaxi(6,        2, 5, 21, 4, -10, 19);
-          printf("maxxi:%d*\\n", maxxi);
-          double maxxD = getMaxD(6,        (double)2.1, (double)5.1, (double)22.1, (double)4.1, (double)-10.1, (double)19.1, (double)2);
-          printf("maxxD:%.2f*\\n", (float)maxxD);
-
-          // And, as a function pointer
-          void (*vfp)(const char *s, ...) = argc == 1211 ? NULL : vary;
-          vfp("*vfp:%d,%d*", 22, 199);
-
-          // ensure lists work properly when copied, reinited etc.
-          varargs_listoffsets_main();
+      test_path = path_from_root('tests', 'core', 'test_varargs')
+      src, output = (test_path + s for s in ('.in', '.out'))
 
-          return 0;
-        }
-        '''
-      self.do_run(src, '*cheez: 0+24*\n*cheez: 0+24*\n*albeit*\n*albeit*\nQ85*\nmaxxi:21*\nmaxxD:22.10*\n*vfp:22,199*\n*vfp:22,199*\n'+
-      'abcdefghijklmno\nabcdefghijklmno\nabcdefghijklmno\nabcdefghijklmno\nabcdefghijklmno\n<BAD+0><BAD+1><BAD+2><BAD+3><BAD+4>\nabcdefghijklmno\n')
+      self.do_run_from_file(src, output)
 
   def test_varargs_byval(self):
     if Settings.USE_TYPED_ARRAYS != 2: return self.skip('FIXME: Add support for this')