.

emscripten-core · May 1, 2019 · f6953b0 · f6953b0
1 parent 0933ed7
commit f6953b0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/tests/core/test_atexit.c b/tests/core/test_atexit.c
@@ -8,10 +8,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-extern "C" {
 extern int __cxa_thread_atexit(void (*dtor)(void *), void *obj, void *dso_symbol);
 extern int __cxa_thread_atexit_impl(void (*dtor)(void *), void *obj, void *dso_symbol);
-}
 
 static void cleanA() { printf("A\n"); }
 static void cleanB() { printf("B\n"); }

diff --git a/tests/core/test_bigarray.c b/tests/core/test_bigarray.c
@@ -14,7 +14,7 @@ struct Struct {
   char x;
   int y;
 };
-Struct buffy[SIZE];
+struct Struct buffy[SIZE];
 
 int main() {
   for (int i = 0; i < SIZE; i++) {

diff --git a/tests/core/test_bitfields.c b/tests/core/test_bitfields.c
@@ -12,7 +12,7 @@ struct bitty {
   unsigned z : 1;
 };
 int main() {
-  bitty b;
+  struct bitty b;
   printf("*");
   for (int i = 0; i <= 1; i++)
     for (int j = 0; j <= 1; j++)

diff --git a/tests/core/test_constglobalstructs.c b/tests/core/test_constglobalstructs.c
@@ -12,7 +12,7 @@ struct IUB {
   unsigned int pi;
 };
 
-IUB iub[] = {{'a', 0.27, 5}, {'c', 0.15, 4}, {'g', 0.12, 3}, {'t', 0.27, 2}, };
+struct IUB iub[] = {{'a', 0.27, 5}, {'c', 0.15, 4}, {'g', 0.12, 3}, {'t', 0.27, 2}, };
 
 const unsigned char faceedgesidx[6][4] = {{4, 5, 8, 10},
                                           {6, 7, 9, 11},
@@ -22,7 +22,7 @@ const unsigned char faceedgesidx[6][4] = {{4, 5, 8, 10},
                                           {2, 3, 5, 7}, };
 
 int main(int argc, const char *argv[]) {
-  printf("*%d,%d,%d,%d*\n", iub[0].c, int(iub[1].p * 100), iub[2].pi,
+  printf("*%d,%d,%d,%d*\n", iub[0].c, (int)(iub[1].p * 100), iub[2].pi,
          faceedgesidx[3][2]);
   return 0;
 }
diff --git a/tests/core/test_conststructs.c b/tests/core/test_conststructs.c
@@ -14,12 +14,12 @@ struct IUB {
 
 int main(int argc, const char *argv[]) {
   int before = 70;
-  IUB iub[] = {{'a', 0.3029549426680, 5},
+  struct IUB iub[] = {{'a', 0.3029549426680, 5},
                {'c', 0.15, 4},
                {'g', 0.12, 3},
                {'t', 0.27, 2}, };
   int after = 90;
-  printf("*%d,%d,%d,%d,%d,%d*\n", before, iub[0].c, int(iub[1].p * 100),
-         iub[2].pi, int(iub[0].p * 10000), after);
+  printf("*%d,%d,%d,%d,%d,%d*\n", before, iub[0].c, (int)(iub[1].p * 100),
+         iub[2].pi, (int)(iub[0].p * 10000), after);
   return 0;
 }
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -4315,7 +4315,7 @@ def test_fnmatch(self):
       assert i > 0 and self.emcc_args[i - 1] == '-s'
       self.emcc_args[i] = 'ASSERTIONS=0'
       print('flip assertions off')
-    self.do_run_in_out_file_test('tests', 'core', 'fnmatch')
+    self.do_run_in_out_file_test('tests', 'core', 'test_fnmatch')
 
   def test_sscanf(self):
     self.do_run_in_out_file_test('tests', 'core', 'test_sscanf')
@@ -5996,7 +5996,7 @@ def do_autodebug(filename):
     # Add an ll hook, to force ll generation
     self.do_run_from_file(src, output, build_ll_hook=lambda x: False)
 
-    filename = 'src.cpp'
+    filename = 'src.c'
     do_autodebug(filename)
 
     # Compare to each other, and to expected output