1 files changed, 87 insertions, 9 deletions

diff --git a/tests/runner.py b/tests/runner.py
index cff43210..9ec2f57d 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -1179,6 +1179,53 @@ m_divisor is 1091269979
       '''
       self.do_run(src, 'Succeeded!')
 
+    def test_i64_varargs(self):
+      if Settings.USE_TYPED_ARRAYS != 2: return self.skip('full i64 stuff only in ta2')
+
+      src = r'''
+        #include <stdio.h>
+        #include <stdint.h>
+        #include <stdarg.h>
+
+        int64_t ccv_cache_generate_signature(char *msg, int len, int64_t sig_start, ...) {
+          if (sig_start < 10123)
+            printf("%s\n", msg+len);
+          va_list v;
+          va_start(v, sig_start);
+          if (sig_start > 1413)
+            printf("%d\n", va_arg(v, int));
+          else
+            printf("nada\n");
+          va_end(v);
+          return len*sig_start*(msg[0]+1);
+        }
+
+        int main(int argc, char **argv)
+        {
+          for (int i = 0; i < argc; i++) {
+            int64_t x;
+            if (i % 123123 == 0)
+              x = ccv_cache_generate_signature(argv[i], i+2, (int64_t)argc*argc, 54.111);
+            else
+              x = ccv_cache_generate_signature(argv[i], i+2, (int64_t)argc*argc, 13);
+            printf("%lld\n", x);
+          }
+        };
+      '''
+      self.do_run(src, '''in/this.program
+nada
+1536
+a
+nada
+5760
+fl
+nada
+6592
+sdfasdfasdf
+nada
+7840
+''', 'waka fleefl asdfasdfasdfasdf'.split(' '))
+
     def test_i32_mul_precise(self):
       if self.emcc_args == None: return self.skip('needs ta2')
 
@@ -2405,28 +2452,34 @@ returned |umber one top notchfi FI FO FUM WHEN WHERE WHY HOW WHO|''', ['wowie',
           static jmp_buf buf;
 
           void second(void) {
-              printf("second\n");         // prints
-              longjmp(buf,1);             // jumps back to where setjmp was called - making setjmp now return 1
+              printf("second\n");
+              longjmp(buf,-1);
           }
 
           void first(void) {
-              second();
-              printf("first\n");          // does not print
+              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;
-              if ( ! setjmp(buf) ) {
+              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++;
-                  first();                // when executed, setjmp returns 0
-              } else {                    // when longjmp jumps back, setjmp returns 1
-                  printf("main: %d\n", x);       // prints
+                  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;
           }
         '''
-        self.do_run(src, 'second\nmain: 1\n')
+        self.do_run(src, 'first\nresult: 1 1\nsecond\nresult: 2 -1')
 
     def test_longjmp2(self):
       src = r'''
@@ -6316,6 +6369,31 @@ def process(filename):
       self.emcc_args += ['--embed-file', 'eol.txt']
       self.do_run(src, 'SUCCESS\n')
 
+    def test_fscanf(self):
+      if self.emcc_args is None: return self.skip('requires emcc')
+      open(os.path.join(self.get_dir(), 'three_numbers.txt'), 'w').write('''-1 0.1 -.1''')
+      src = r'''
+        #include <stdio.h>
+        #include <assert.h>
+        #include <float.h>
+        int main()
+        {
+            float x = FLT_MAX, y = FLT_MAX, z = FLT_MAX;
+
+            FILE* fp = fopen("three_numbers.txt", "r");
+            if (fp) {
+                int match = fscanf(fp, " %f %f %f ", &x, &y, &z);
+                printf("match = %d\n", match);
+                printf("x = %0.1f, y = %0.1f, z = %0.1f\n", x, y, z);
+            } else {
+                printf("failed to open three_numbers.txt\n");
+            }
+            return 0;
+        }
+      '''
+      self.emcc_args += ['--embed-file', 'three_numbers.txt']
+      self.do_run(src, 'match = 3\nx = -1.0, y = 0.1, z = -0.1\n')
+
     def test_folders(self):
       add_pre_run = '''
 def process(filename):