testing: Add support for C source in runner.do_run_in_out_file_test

Honor the source file extension, which means that quite a few C++ sources had to be renamed because they were called `.c`. Also, increase usage of do_run_in_out_file_test.
emscripten-core · May 1, 2019 · 2ca790e · 2ca790e
1 parent def72b5
commit 2ca790e
Show file tree

Hide file tree

Showing 76 changed files with 86 additions and 243 deletions.
diff --git a/system/include/libc/features.h b/system/include/libc/features.h
@@ -2,6 +2,7 @@
 #define _FEATURES_H
 
 #if defined(_ALL_SOURCE) && !defined(_GNU_SOURCE)
+#error foo
 #define _GNU_SOURCE 1
 #endif
 

diff --git a/tests/core/test_assert.c → tests/core/test_assert.cpp b/tests/core/test_assert.c → tests/core/test_assert.cpp
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_bswap64.c → tests/core/test_bswap64.cpp b/tests/core/test_bswap64.c → tests/core/test_bswap64.cpp
diff --git a/tests/core/test_class.c → tests/core/test_class.cpp b/tests/core/test_class.c → tests/core/test_class.cpp
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/core/test_copyop.c → tests/core/test_copyop.cpp b/tests/core/test_copyop.c → tests/core/test_copyop.cpp
diff --git a/tests/ctype/src.c → tests/core/test_ctype.c b/tests/ctype/src.c → tests/core/test_ctype.c
diff --git a/tests/ctype/output.txt → tests/core/test_ctype.out b/tests/ctype/output.txt → tests/core/test_ctype.out
diff --git a/tests/core/test_cxx03_do_run.c → tests/core/test_cxx03_do_run.cpp b/tests/core/test_cxx03_do_run.c → tests/core/test_cxx03_do_run.cpp
diff --git a/.../core/test_direct_string_constant_usage.c → ...ore/test_direct_string_constant_usage.cpp b/.../core/test_direct_string_constant_usage.c → ...ore/test_direct_string_constant_usage.cpp
diff --git a/tests/core/test_double_i64_conversion.c b/tests/core/test_double_i64_conversion.c
@@ -9,7 +9,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-__attribute((noinline)) bool eq(double d, int64_t i) {
+__attribute((noinline)) int eq(double d, int64_t i) {
   int64_t i2 = (int64_t)d;
   if (i != i2) {
     printf("%.20g converted to int64 returns %lld, not %lld as expected!\n", d,

diff --git a/tests/core/test_emptyclass.c → tests/core/test_emptyclass.cpp b/tests/core/test_emptyclass.c → tests/core/test_emptyclass.cpp
diff --git a/tests/core/test_exceptions_alias.c → tests/core/test_exceptions_alias.cpp b/tests/core/test_exceptions_alias.c → tests/core/test_exceptions_alias.cpp
diff --git a/tests/core/test_exceptions_typed.c → tests/core/test_exceptions_typed.cpp b/tests/core/test_exceptions_typed.c → tests/core/test_exceptions_typed.cpp
diff --git a/tests/core/test_exceptions_white_list_2.c → tests/core/test_exceptions_white_list_2.cpp b/tests/core/test_exceptions_white_list_2.c → tests/core/test_exceptions_white_list_2.cpp
diff --git a/tests/core/test_fakestat.c b/tests/core/test_fakestat.c
@@ -10,7 +10,7 @@ struct stat {
   int x, y;
 };
 int main() {
-  stat s;
+  struct stat s;
   s.x = 10;
   s.y = 22;
   printf("*%d,%d*\n", s.x, s.y);

diff --git a/tests/core/test_fcvt.c → tests/core/test_fcvt.cpp b/tests/core/test_fcvt.c → tests/core/test_fcvt.cpp
@@ -5,7 +5,8 @@
  * found in the LICENSE file.
  */
 
-/* This example borrowed from MSDN documentation */#include <stdlib.h>
+/* This example borrowed from MSDN documentation */
+#include <stdlib.h>
 #include <stdio.h>
 
 int main() {

diff --git a/tests/core/test_floatvars.c → tests/core/test_floatvars.cpp b/tests/core/test_floatvars.c → tests/core/test_floatvars.cpp
diff --git a/tests/core/fnmatch.c → tests/core/test_fnmatch.cpp b/tests/core/fnmatch.c → tests/core/test_fnmatch.cpp
diff --git a/tests/core/fnmatch.out → tests/core/test_fnmatch.out b/tests/core/fnmatch.out → tests/core/test_fnmatch.out
diff --git a/tests/core/test_i64_2.c → tests/core/test_i64_2.cpp b/tests/core/test_i64_2.c → tests/core/test_i64_2.cpp
diff --git a/tests/core/test_i64_3.c → tests/core/test_i64_3.cpp b/tests/core/test_i64_3.c → tests/core/test_i64_3.cpp
diff --git a/tests/core/test_i64_b.c → tests/core/test_i64_b.cpp b/tests/core/test_i64_b.c → tests/core/test_i64_b.cpp
diff --git a/tests/core/test_i64_cmp.c → tests/core/test_i64_cmp.cpp b/tests/core/test_i64_cmp.c → tests/core/test_i64_cmp.cpp
diff --git a/tests/core/test_i64_double.c → tests/core/test_i64_double.cpp b/tests/core/test_i64_double.c → tests/core/test_i64_double.cpp
diff --git a/tests/core/test_inherit.c → tests/core/test_inherit.cpp b/tests/core/test_inherit.c → tests/core/test_inherit.cpp
diff --git a/tests/core/test_intvars.c → tests/core/test_intvars.cpp b/tests/core/test_intvars.c → tests/core/test_intvars.cpp
diff --git a/tests/core/test_isdigit_l.c → tests/core/test_isdigit_l.cpp b/tests/core/test_isdigit_l.c → tests/core/test_isdigit_l.cpp
diff --git a/tests/core/test_istream.c → tests/core/test_istream.cpp b/tests/core/test_istream.c → tests/core/test_istream.cpp
diff --git a/tests/core/test_iswdigit.c → tests/core/test_iswdigit.cpp b/tests/core/test_iswdigit.c → tests/core/test_iswdigit.cpp
diff --git a/tests/langinfo/test.c → tests/core/test_langinfo.c b/tests/langinfo/test.c → tests/core/test_langinfo.c
diff --git a/tests/langinfo/output.txt → tests/core/test_langinfo.out b/tests/langinfo/output.txt → tests/core/test_langinfo.out
diff --git a/tests/core/test_linked_list.c b/tests/core/test_linked_list.c
@@ -10,22 +10,23 @@ struct worker_args {
   int value;
   struct worker_args* next;
 };
+
 int main() {
-  worker_args a;
-  worker_args b;
+  struct worker_args a;
+  struct worker_args b;
   a.value = 60;
   a.next = &b;
   b.value = 900;
   b.next = NULL;
-  worker_args* c = &a;
+  struct worker_args* c = &a;
   int total = 0;
   while (c) {
     total += c->value;
     c = c->next;
   }
 
   // Chunk of em
-  worker_args chunk[10];
+  struct worker_args chunk[10];
   for (int i = 0; i < 9; i++) {
     chunk[i].value = i * 10;
     chunk[i].next = &chunk[i + 1];

diff --git a/tests/core/test_llvm_used.c b/tests/core/test_llvm_used.c
@@ -8,14 +8,12 @@
 #include <stdio.h>
 #include <emscripten.h>
 
-extern "C" {
-        __attribute__((annotate("hello attribute world")))
-        EMSCRIPTEN_KEEPALIVE void foobar(int x) {
-                printf("Worked! %d\n", x);
-        }
+__attribute__((annotate("hello attribute world")))
+EMSCRIPTEN_KEEPALIVE void foobar(int x) {
+    printf("Worked! %d\n", x);
 }
 
 int main() {
-        emscripten_run_script("Module['_foobar'](10)");
-        return 0;
+    emscripten_run_script("Module['_foobar'](10)");
+    return 0;
 }
diff --git a/tests/core/test_math.c → tests/core/test_math.cpp b/tests/core/test_math.c → tests/core/test_math.cpp
diff --git a/tests/hyperbolic/src.c → tests/core/test_math_hyperbolic.c b/tests/hyperbolic/src.c → tests/core/test_math_hyperbolic.c
diff --git a/tests/hyperbolic/output.txt → tests/core/test_math_hyperbolic.out b/tests/hyperbolic/output.txt → tests/core/test_math_hyperbolic.out
diff --git a/tests/core/test_mod_globalstruct.c b/tests/core/test_mod_globalstruct.c
@@ -11,7 +11,7 @@ struct malloc_params {
   size_t magic, page_size;
 };
 
-malloc_params mparams;
+struct malloc_params mparams;
 
 #define SIZE_T_ONE ((size_t)1)
 #define page_align(S) \

diff --git a/tests/parseInt/src.c → tests/core/test_parseInt.c b/tests/parseInt/src.c → tests/core/test_parseInt.c
diff --git a/tests/parseInt/output.txt → tests/core/test_parseInt.out b/tests/parseInt/output.txt → tests/core/test_parseInt.out
diff --git a/tests/core/test_polymorph.c → tests/core/test_polymorph.cpp b/tests/core/test_polymorph.c → tests/core/test_polymorph.cpp
diff --git a/tests/core/test_reinterpreted_ptrs.c → tests/core/test_reinterpreted_ptrs.cpp b/tests/core/test_reinterpreted_ptrs.c → tests/core/test_reinterpreted_ptrs.cpp
diff --git a/tests/core/test_stack.c b/tests/core/test_stack.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 int test(int i) {
   int x = 10;
-  int ret = reinterpret_cast<long>(&x);  // both for the number, and forces x to not be nativized
+  int ret = (long)&x;  // both for the number, and forces x to not be nativized
   if (i > 0) {
     if ((i % 2001) != 1500)
       return test(i - 1);

diff --git a/tests/core/test_stack_byval.c → tests/core/test_stack_byval.cpp b/tests/core/test_stack_byval.c → tests/core/test_stack_byval.cpp
@@ -7,11 +7,13 @@
 
 // We should also not blow up the stack with byval arguments
 #include <stdio.h>
+
 struct vec {
   int x, y, z;
   vec(int x_, int y_, int z_) : x(x_), y(y_), z(z_) {}
   static vec add(vec a, vec b) { return vec(a.x + b.x, a.y + b.y, a.z + b.z); }
 };
+
 int main() {
   int total = 0;
   for (int i = 0; i < 1000; i++) {

diff --git a/tests/core/test_static_variable.c → tests/core/test_static_variable.cpp b/tests/core/test_static_variable.c → tests/core/test_static_variable.cpp
diff --git a/tests/core/test_statics.c → tests/core/test_statics.cpp b/tests/core/test_statics.c → tests/core/test_statics.cpp
@@ -26,6 +26,7 @@ struct XYZ {
     return iT;
   }
 };
+
 struct S {
   static const XYZ &getIdentity() {
     static const XYZ iT(XYZ::getIdentity());

diff --git a/tests/core/test_stdlibs.c b/tests/core/test_stdlibs.c
@@ -23,9 +23,9 @@ int comparer(const void *a, const void *b) {
 
 int main() {
   // timeofday
-  timeval t;
+  struct timeval t;
   gettimeofday(&t, NULL);
-  printf("*%d,%d\n", int(t.tv_sec), int(t.tv_usec)); // should not crash
+  printf("*%d,%d\n", (int)t.tv_sec, (int)t.tv_usec); // should not crash
 
   // atexit
   atexit(clean);

diff --git a/tests/core/test_stdvec.c → tests/core/test_stdvec.cpp b/tests/core/test_stdvec.c → tests/core/test_stdvec.cpp
diff --git a/tests/core/test_strings.c b/tests/core/test_strings.c
@@ -24,11 +24,11 @@ int main(int argc, char **argv) {
   puts(argv[2]);
   printf("%d\n", atoi(argv[3]) + 2);
   const char *foolingthecompiler = "\rabcd";
-  printf("%d\n", strlen(foolingthecompiler));  // Tests parsing /0D in llvm -
+  printf("%lu\n", strlen(foolingthecompiler)); // Tests parsing /0D in llvm -
                                                // should not be a 0 (end string)
                                                // then a D!
-  printf("%s\n", NULL);  // Should print '(null)', not the string at address 0,
-                         // which is a real address for us!
+  printf("null -> %s\n", NULL);  // Should print '(null)', not the string at address 0,
+                                 // which is a real address for us!
   printf("/* a comment */\n");  // Should not break the generated code!
   printf("// another\n");       // Should not break the generated code!
 
@@ -37,8 +37,8 @@ int main(int argc, char **argv) {
   free(strdup_val);
 
   {
-    char *one = "one 1 ONE !";
-    char *two = "two 2 TWO ?";
+    const char *one = "one 1 ONE !";
+    const char *two = "two 2 TWO ?";
     char three[1024];
     memset(three, '.', 1024);
     three[50] = 0;
@@ -48,8 +48,8 @@ int main(int argc, char **argv) {
   }
 
   {
-    char *one = "string number one top notch";
-    char *two = "fa la sa ho fi FI FO FUM WHEN WHERE WHY HOW WHO";
+    const char *one = "string number one top notch";
+    const char *two = "fa la sa ho fi FI FO FUM WHEN WHERE WHY HOW WHO";
     char three[1000];
     strcpy(three, &one[argc * 2]);
     char *four = strcat(three, &two[argc * 3]);

diff --git a/tests/core/test_strings.out b/tests/core/test_strings.out
@@ -4,10 +4,10 @@ wowie
 too
 76
 5
-(null)
+null -> (null)
 /* a comment */
 // another
 test
 waka ....e 1 O...wo 2 T................................
 cat |umber one top notchfi FI FO FUM WHEN WHERE WHY HOW WHO|
-returned |umber one top notchfi FI FO FUM WHEN WHERE WHY HOW WHO|
+returned |umber one top notchfi FI FO FUM WHEN WHERE WHY HOW WHO|
diff --git a/tests/core/test_strptime_tm.c b/tests/core/test_strptime_tm.c
@@ -11,7 +11,7 @@
 
 void ReadMonth(const char *month)
 {
-    tm value = {0};
+    struct tm value = {0};
     if(strptime(month, "%b", &value))
     {
         printf("%s: %d\n", month, value.tm_mon);

diff --git a/tests/core/test_structs.c b/tests/core/test_structs.c
@@ -6,16 +6,18 @@
  */
 
 #include <stdio.h>
+
 struct S {
   int x, y;
 };
+
 int main() {
-  S a, b;
+  struct S a, b;
   a.x = 5;
   a.y = 6;
   b.x = 101;
   b.y = 7009;
-  S *c, *d;
+  struct S *c, *d;
   c = &a;
   c->x *= 2;
   c = &b;

diff --git a/tests/systypes/src.c → tests/core/test_systypes.c b/tests/systypes/src.c → tests/core/test_systypes.c
diff --git a/tests/systypes/output.txt → tests/core/test_systypes.out b/tests/systypes/output.txt → tests/core/test_systypes.out
diff --git a/tests/time/src.cpp → tests/core/test_time.cpp b/tests/time/src.cpp → tests/core/test_time.cpp
diff --git a/tests/time/output.txt → tests/core/test_time.out b/tests/time/output.txt → tests/core/test_time.out
diff --git a/tests/core/test_timeb.c b/tests/core/test_timeb.c
@@ -10,7 +10,7 @@
 #include <sys/timeb.h>
 
 int main() {
-  timeb tb;
+  struct timeb tb;
   tb.timezone = 1;
   printf("*%d\n", ftime(&tb));
   assert(tb.time > 10000);

diff --git a/tests/core/test_tinyfuncstr.c → tests/core/test_tinyfuncstr.cpp b/tests/core/test_tinyfuncstr.c → tests/core/test_tinyfuncstr.cpp
diff --git a/tests/core/test_typeid.c → tests/core/test_typeid.cpp b/tests/core/test_typeid.c → tests/core/test_typeid.cpp
diff --git a/tests/dirent/test_readdir.c b/tests/dirent/test_readdir.c
@@ -183,7 +183,6 @@ void test_scandir() {
 }
 
 int main() {
-  printf("SIGILL: %s\n", strsignal(SIGILL));
   atexit(cleanup);
   signal(SIGABRT, cleanup);
   setup();

diff --git a/tests/dirent/test_readdir.out b/tests/dirent/test_readdir.out
@@ -0,0 +1,10 @@
+success
+n: 8
+name: tmp
+name: proc
+name: nocanread
+name: home
+name: foobar
+name: dev
+name: ..
+name: .
diff --git a/tests/dirent/test_readdir_empty.out b/tests/dirent/test_readdir_empty.out
@@ -0,0 +1 @@
+success
diff --git a/tests/fcntl/src.c → tests/fcntl/test_fcntl.c b/tests/fcntl/src.c → tests/fcntl/test_fcntl.c
diff --git a/tests/fcntl/output.txt → tests/fcntl/test_fcntl.out b/tests/fcntl/output.txt → tests/fcntl/test_fcntl.out
diff --git a/tests/fcntl-misc/src.c → tests/fcntl/test_fcntl_misc.c b/tests/fcntl-misc/src.c → tests/fcntl/test_fcntl_misc.c
diff --git a/tests/fcntl-misc/output.txt → tests/fcntl/test_fcntl_misc.out b/tests/fcntl-misc/output.txt → tests/fcntl/test_fcntl_misc.out
diff --git a/tests/fcntl-open/src.c → tests/fcntl/test_fcntl_open.c b/tests/fcntl-open/src.c → tests/fcntl/test_fcntl_open.c
diff --git a/tests/fcntl-open/output.txt → tests/fcntl/test_fcntl_open.out b/tests/fcntl-open/output.txt → tests/fcntl/test_fcntl_open.out