From 144944dd8bf17f2f8386779faba6d5136dece9fb Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 3 Jul 2009 22:28:07 +0000 Subject: rename custom_wallkw to wallkw - custom commandline tests needn't start with custom_ git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11357 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/common.mk | 4 ++-- Examples/test-suite/custom_wallkw.i | 16 --------------- Examples/test-suite/java/custom_wallkw_runme.java | 25 ----------------------- Examples/test-suite/java/wallkw_runme.java | 25 +++++++++++++++++++++++ Examples/test-suite/wallkw.i | 16 +++++++++++++++ 5 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 Examples/test-suite/custom_wallkw.i delete mode 100644 Examples/test-suite/java/custom_wallkw_runme.java create mode 100644 Examples/test-suite/java/wallkw_runme.java create mode 100644 Examples/test-suite/wallkw.i diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index dcc5da2bd..74baddc81 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -142,7 +142,6 @@ CPP_TEST_CASES += \ cpp_nodefault \ cpp_static \ cpp_typedef \ - custom_wallkw \ default_args \ default_constructor \ defvalue_constructor \ @@ -395,6 +394,7 @@ CPP_TEST_CASES += \ virtual_destructor \ virtual_poly \ voidtest \ + wallkw \ wrapmacro # @@ -470,7 +470,7 @@ MULTI_CPP_TEST_CASES += \ multi_import # Custom tests - tests with additional commandline options -custom_wallkw.cpptest: SWIGOPT += -Wallkw +wallkw.cpptest: SWIGOPT += -Wallkw NOT_BROKEN_TEST_CASES = $(CPP_TEST_CASES:=.cpptest) \ diff --git a/Examples/test-suite/custom_wallkw.i b/Examples/test-suite/custom_wallkw.i deleted file mode 100644 index 1f4742a19..000000000 --- a/Examples/test-suite/custom_wallkw.i +++ /dev/null @@ -1,16 +0,0 @@ -%module custom_wallkw - -// test the -Wallkw option - -%warnfilter(SWIGWARN_PARSE_KEYWORD) clone; // 'clone' is a php keyword, renamed as 'c_clone' -%warnfilter(SWIGWARN_PARSE_KEYWORD) delegate; // 'delegate' is a C# keyword, renaming to '_delegate' -%warnfilter(SWIGWARN_PARSE_KEYWORD) pass; // 'pass' is a python keyword, renaming to '_pass' -%warnfilter(SWIGWARN_PARSE_KEYWORD) alias; // 'alias' is a ruby keyword, renaming to 'C_alias' - -%inline %{ -const char * clone() { return "clone"; } -const char * delegate() { return "delegate"; } -const char * pass() { return "pass"; } -const char * alias() { return "alias"; } -%} - diff --git a/Examples/test-suite/java/custom_wallkw_runme.java b/Examples/test-suite/java/custom_wallkw_runme.java deleted file mode 100644 index 08d9539bd..000000000 --- a/Examples/test-suite/java/custom_wallkw_runme.java +++ /dev/null @@ -1,25 +0,0 @@ - -import custom_wallkw.*; - -public class custom_wallkw_runme { - - static { - try { - System.loadLibrary("custom_wallkw"); - } catch (UnsatisfiedLinkError e) { - System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); - System.exit(1); - } - } - - public static void main(String argv[]) { - if (!custom_wallkw.c_clone().equals("clone")) - throw new RuntimeException("clone_c keyword fail"); - if (!custom_wallkw._delegate().equals("delegate")) - throw new RuntimeException("delegate keyword fail"); - if (!custom_wallkw._pass().equals("pass")) - throw new RuntimeException("pass keyword fail"); - if (!custom_wallkw.C_alias().equals("alias")) - throw new RuntimeException("alias keyword fail"); - } -} diff --git a/Examples/test-suite/java/wallkw_runme.java b/Examples/test-suite/java/wallkw_runme.java new file mode 100644 index 000000000..028c2a32f --- /dev/null +++ b/Examples/test-suite/java/wallkw_runme.java @@ -0,0 +1,25 @@ + +import wallkw.*; + +public class wallkw_runme { + + static { + try { + System.loadLibrary("wallkw"); + } catch (UnsatisfiedLinkError e) { + System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); + System.exit(1); + } + } + + public static void main(String argv[]) { + if (!wallkw.c_clone().equals("clone")) + throw new RuntimeException("clone_c keyword fail"); + if (!wallkw._delegate().equals("delegate")) + throw new RuntimeException("delegate keyword fail"); + if (!wallkw._pass().equals("pass")) + throw new RuntimeException("pass keyword fail"); + if (!wallkw.C_alias().equals("alias")) + throw new RuntimeException("alias keyword fail"); + } +} diff --git a/Examples/test-suite/wallkw.i b/Examples/test-suite/wallkw.i new file mode 100644 index 000000000..0ac383bcd --- /dev/null +++ b/Examples/test-suite/wallkw.i @@ -0,0 +1,16 @@ +%module wallkw + +// test the -Wallkw option + +%warnfilter(SWIGWARN_PARSE_KEYWORD) clone; // 'clone' is a php keyword, renamed as 'c_clone' +%warnfilter(SWIGWARN_PARSE_KEYWORD) delegate; // 'delegate' is a C# keyword, renaming to '_delegate' +%warnfilter(SWIGWARN_PARSE_KEYWORD) pass; // 'pass' is a python keyword, renaming to '_pass' +%warnfilter(SWIGWARN_PARSE_KEYWORD) alias; // 'alias' is a ruby keyword, renaming to 'C_alias' + +%inline %{ +const char * clone() { return "clone"; } +const char * delegate() { return "delegate"; } +const char * pass() { return "pass"; } +const char * alias() { return "alias"; } +%} + -- cgit v1.2.1