From 144944dd8bf17f2f8386779faba6d5136dece9fb Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 3 Jul 2009 22:28:07 +0000 Subject: [PATCH] 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 ++-- ...{custom_wallkw_runme.java => wallkw_runme.java} | 14 +++++++------- Examples/test-suite/{custom_wallkw.i => wallkw.i} | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) rename Examples/test-suite/java/{custom_wallkw_runme.java => wallkw_runme.java} (63%) rename Examples/test-suite/{custom_wallkw.i => wallkw.i} (96%) 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/java/custom_wallkw_runme.java b/Examples/test-suite/java/wallkw_runme.java similarity index 63% rename from Examples/test-suite/java/custom_wallkw_runme.java rename to Examples/test-suite/java/wallkw_runme.java index 08d9539bd..028c2a32f 100644 --- a/Examples/test-suite/java/custom_wallkw_runme.java +++ b/Examples/test-suite/java/wallkw_runme.java @@ -1,11 +1,11 @@ -import custom_wallkw.*; +import wallkw.*; -public class custom_wallkw_runme { +public class wallkw_runme { static { try { - System.loadLibrary("custom_wallkw"); + 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); @@ -13,13 +13,13 @@ public class custom_wallkw_runme { } public static void main(String argv[]) { - if (!custom_wallkw.c_clone().equals("clone")) + if (!wallkw.c_clone().equals("clone")) throw new RuntimeException("clone_c keyword fail"); - if (!custom_wallkw._delegate().equals("delegate")) + if (!wallkw._delegate().equals("delegate")) throw new RuntimeException("delegate keyword fail"); - if (!custom_wallkw._pass().equals("pass")) + if (!wallkw._pass().equals("pass")) throw new RuntimeException("pass keyword fail"); - if (!custom_wallkw.C_alias().equals("alias")) + if (!wallkw.C_alias().equals("alias")) throw new RuntimeException("alias keyword fail"); } } diff --git a/Examples/test-suite/custom_wallkw.i b/Examples/test-suite/wallkw.i similarity index 96% rename from Examples/test-suite/custom_wallkw.i rename to Examples/test-suite/wallkw.i index 1f4742a19..0ac383bcd 100644 --- a/Examples/test-suite/custom_wallkw.i +++ b/Examples/test-suite/wallkw.i @@ -1,4 +1,4 @@ -%module custom_wallkw +%module wallkw // test the -Wallkw option