From 75d9cb47694e1d2a8d4d36bcbe668fc89e3496fb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 22 Apr 2016 01:37:24 +0200 Subject: [PATCH] Remove C-specific cpp_basic_global_var_built_in unit test There is no need for it, the common global_vars unit test is more extensive and passes too now. --- Examples/test-suite/c/Makefile.in | 1 - .../c/cpp_basic_global_var_built_in_runme.c | 13 ------------- Examples/test-suite/c/global_vars_runme.c | 12 ++++++++++++ Examples/test-suite/cpp_basic_global_var_built_in.i | 5 ----- 4 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c create mode 100644 Examples/test-suite/c/global_vars_runme.c delete mode 100644 Examples/test-suite/cpp_basic_global_var_built_in.i diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index b94cf0eb1..857464a61 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -19,7 +19,6 @@ CPP_TEST_CASES := \ cpp_basic_class_virtual_method \ cpp_basic_class_var_pub_member_built_in \ cpp_basic_class_var_pub_member_class \ - cpp_basic_global_var_built_in \ cpp_basic_global_var_class \ cpp_basic_namespaced_class \ cpp_basic_template_function \ diff --git a/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c b/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c deleted file mode 100644 index 3ed025fc5..000000000 --- a/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include "cpp_basic_global_var_built_in/cpp_basic_global_var_built_in_wrap.h" - -int main(int argc, const char *argv[]) -{ - assert(myGlobalInt == 42); - - myGlobalInt = 4711; - - assert(myGlobalInt == 4711); - - return 0; -} diff --git a/Examples/test-suite/c/global_vars_runme.c b/Examples/test-suite/c/global_vars_runme.c new file mode 100644 index 000000000..3802ab6be --- /dev/null +++ b/Examples/test-suite/c/global_vars_runme.c @@ -0,0 +1,12 @@ +#include +#include "global_vars/global_vars_wrap.h" + +int main(int argc, const char *argv[]) +{ + init(); + + assert(strcmp(b_get(), "string b") == 0); + assert(x == 1234); + + return 0; +} diff --git a/Examples/test-suite/cpp_basic_global_var_built_in.i b/Examples/test-suite/cpp_basic_global_var_built_in.i deleted file mode 100644 index c0cc1ba91..000000000 --- a/Examples/test-suite/cpp_basic_global_var_built_in.i +++ /dev/null @@ -1,5 +0,0 @@ -%module cpp_basic_global_var_atom - -%inline { - int myGlobalInt = 42; -}