Merge pull request #1731 from avlee/pythontests

python tests

include/mapnik/enumeration.hpp

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

tests/run_tests.py

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