sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1731 from avlee/pythontests

Browse source 
python tests
This commit is contained in:
Dane Springmeyer 2013-02-23 08:26:56 -08:00
commit 1454105b12
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/enumeration.hpp
View file

@ -320,7 +320,7 @@ operator>>(std::istream & is, mapnik::enumeration<ENUM, THE_MAX> & e)
/** Helper macro. Creates a typedef. /** Helper macro. Creates a typedef.
* @relates mapnik::enumeration * @relates mapnik::enumeration
*/ */
#ifdef _MSC_VER_ #ifdef _MSC_VER
#define DEFINE_ENUM( name, e) \ #define DEFINE_ENUM( name, e) \
template enumeration<e, e ## _MAX>; \ template enumeration<e, e ## _MAX>; \
typedef enumeration<e, e ## _MAX> name typedef enumeration<e, e ## _MAX> name

4
tests/run_tests.py
View file

@ -72,8 +72,8 @@ def main():
argv.append('-v') argv.append('-v')
argv.append('-v') argv.append('-v')
dirname = os.path.dirname(sys.argv[0]) dirname = os.path.dirname(sys.argv[0])
argv.extend(['-w', dirname+'/python_tests']) argv.extend(['-w', os.path.join(dirname,'python_tests')])
if not nose.run(argv=argv, plugins=[TodoPlugin(), Doctest()]): if not nose.run(argv=argv, plugins=[TodoPlugin(), Doctest()]):
sys.exit(1) sys.exit(1)