[pypy-commit] pypy stm-gc-2: Fix test_stmgcintf.py.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stm-gc-2
Changeset: r63116:d539fc09cdc6
Date: 2013-04-07 16:56 +0200
http://bitbucket.org/pypy/pypy/changeset/d539fc09cdc6/

Log:	Fix test_stmgcintf.py.

diff --git a/rpython/translator/stm/src_stm/et.c b/rpython/translator/stm/src_stm/et.c
--- a/rpython/translator/stm/src_stm/et.c
+++ b/rpython/translator/stm/src_stm/et.c
@@ -5,6 +5,13 @@
  * runs for long enough.
  */
 
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 500
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/rpython/translator/stm/src_stm/rpyintf.c b/rpython/translator/stm/src_stm/rpyintf.c
--- a/rpython/translator/stm/src_stm/rpyintf.c
+++ b/rpython/translator/stm/src_stm/rpyintf.c
@@ -105,7 +105,7 @@
     assert(d->reads_size_limit_nonatomic == 0);
 #endif
 
-  return d->count_reads > d->reads_size_limit;
+  return d->count_reads >= d->reads_size_limit;
 }
 
 void stm_set_transaction_length(long length_max)
diff --git a/rpython/translator/stm/test/test_stmgcintf.c b/rpython/translator/stm/test/test_stmgcintf.c
--- a/rpython/translator/stm/test/test_stmgcintf.c
+++ b/rpython/translator/stm/test/test_stmgcintf.c
@@ -1,3 +1,6 @@
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE 500
+
 #include <stddef.h>
 
 #define PYPY_LONG_BIT   (sizeof(long) * 8)
@@ -25,6 +28,10 @@
 } S1;
 
 typedef char bool_t;
+typedef char RPyString;
+
+#define _RPyString_AsString(x) x
+#define RPyString_Size(x) strlen(x)
 
 
 #include "src_stm/et.h"
diff --git a/rpython/translator/stm/test/test_stmgcintf.py b/rpython/translator/stm/test/test_stmgcintf.py
--- a/rpython/translator/stm/test/test_stmgcintf.py
+++ b/rpython/translator/stm/test/test_stmgcintf.py
@@ -9,7 +9,7 @@
     try:
         os.chdir(thisdir)
         exitcode = os.system(
-            "gcc -g -o '%s' -pthread -I.. test_stmgcintf.c" % (
+            "gcc -lrt -g -o '%s' -pthread -I.. test_stmgcintf.c" % (
             executable,))
         assert exitcode == 0
     finally: