jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bypass Python tests failing with -builtin

Browse source 
Reverse operators not supported in builtin types
This commit is contained in:
William S Fulton 2014-10-02 20:18:38 +01:00
commit 9f1b051c16
5 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Examples/test-suite/li_std_string_extra.i
View file

@ -49,6 +49,12 @@ std::basic_string<char,std::char_traits<char>,std::allocator<char> > test_value_
return x; return x;
} }
#ifdef SWIGPYTHON_BUILTIN
bool is_python_builtin() { return true; }
#else
bool is_python_builtin() { return false; }
#endif
%} %}
%include "li_std_string.i" %include "li_std_string.i"

6
Examples/test-suite/li_std_wstring.i
View file

@ -92,6 +92,12 @@ void test_throw() throw(std::wstring){
#pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
#endif #endif
#ifdef SWIGPYTHON_BUILTIN
bool is_python_builtin() { return true; }
#else
bool is_python_builtin() { return false; }
#endif
%} %}

2
Examples/test-suite/python/Makefile.in
View file

@ -90,8 +90,6 @@ BUILTIN_BROKEN = \
autodoc.cpptest \ autodoc.cpptest \
default_constructor.cpptest \ default_constructor.cpptest \
import_nomodule.cpptest \ import_nomodule.cpptest \
li_std_string_extra.cpptest \
li_std_wstring.cpptest \
python_abstractbase.cpptest \ python_abstractbase.cpptest \
BUILTIN_NOT_BROKEN = $(filter-out $(BUILTIN_BROKEN),$(NOT_BROKEN_TEST_CASES)) BUILTIN_NOT_BROKEN = $(filter-out $(BUILTIN_BROKEN),$(NOT_BROKEN_TEST_CASES))

9
Examples/test-suite/python/li_std_string_extra_runme.py
View file

@ -56,13 +56,12 @@ if a + " world" != "hello world":
# This is expected to fail with -builtin option # This is expected to fail with -builtin option
# Reverse operators not supported in builtin types # Reverse operators not supported in builtin types
if "hello" + b != "hello world": if not li_std_string_extra.is_python_builtin():
if "hello" + b != "hello world":
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
# This is expected to fail with -builtin option c = "hello" + b
# Reverse operators not supported in builtin types if c.find_last_of("l") != 9:
c = "hello" + b
if c.find_last_of("l") != 9:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
s = "hello world" s = "hello world"

9
Examples/test-suite/python/li_std_wstring_runme.py
View file

@ -60,12 +60,13 @@ if a + " world" != "hello world":
raise RuntimeError("bad string mapping") raise RuntimeError("bad string mapping")
# This is expected to fail if -builtin is used # This is expected to fail if -builtin is used
if "hello" + b != "hello world": # Reverse operators not supported in builtin types
if not li_std_wstring.is_python_builtin():
if "hello" + b != "hello world":
raise RuntimeError("bad string mapping") raise RuntimeError("bad string mapping")
# This is expected to fail if -builtin is used c = "hello" + b
c = "hello" + b if c.find_last_of("l") != 9:
if c.find_last_of("l") != 9:
raise RuntimeError("bad string mapping") raise RuntimeError("bad string mapping")
s = "hello world" s = "hello world"