[pypy-commit] creflect default: more fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r122:b08f974d6137
Date: 2014-11-29 18:13 +0100
http://bitbucket.org/cffi/creflect/changeset/b08f974d6137/

Log:	more fixes

diff --git a/creflect/driver.py b/creflect/driver.py
--- a/creflect/driver.py
+++ b/creflect/driver.py
@@ -68,7 +68,7 @@
         funcname = '_creflect_block%d' % blocknum
         output = expand_cdef(''.join(csource), funcname, first_lineno)
         outputf.write(output)
-        outputf.write('#define _CREFLECT_BLOCK%(blocknum)d\n' % {
+        outputf.write('#define _CRX_BLOCK%(blocknum)d\n' % {
             'blocknum': blocknum})
         if include_text_outside_creflect:
             outputf.write("\n/***** CREFLECT block end, "
@@ -88,7 +88,7 @@
 %s}
 '''
 CALL_TEMPLATE2 = '''\
-#ifdef _CREFLECT_BLOCK%(blocknum)d
+#ifdef _CRX_BLOCK%(blocknum)d
     %(funcname)s(cb);
 #endif
 '''
diff --git a/test/test_driver.py b/test/test_driver.py
--- a/test/test_driver.py
+++ b/test/test_driver.py
@@ -11,9 +11,10 @@
     f.close()
     #
     from creflect.driver import __file__
-    err = os.system("gcc -g -Werror -Wall -o '%s' -I../creflect"
-                    " '%s.c' ../creflect/creflect_debug_print.c" % (
-                        executable, executable))
+    creflect_dir = os.path.dirname(__file__)
+    err = os.system("cd '%s' && gcc -g -Werror -Wall -o '%s' -I."
+                    " '%s.c' creflect_debug_print.c" % (
+                        creflect_dir, executable, executable))
     assert err == 0
     #
     g = os.popen("'%s'" % (executable,), 'r')