Revert "THRIFT-2578 Moving 'make cross' from test.sh to test.py"
This reverts commit c53bbd2c4b2df1dafaf71fec822269b0a63268ef.
oops, I accidently committed this, sorry!
diff --git a/test/tests.json b/test/tests.json
index 54d699e..2c16a69 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -4,7 +4,7 @@
"description": "Python TestClient",
"lib": "py",
"executable": "py/TestClient.py",
- "exit": "hard",
+ "extra_args": ["--genpydir=py/gen-py"],
"protocols": [
"binary",
"compact",
@@ -27,7 +27,6 @@
"description": "C++ TestClient",
"lib": "cpp",
"executable": "cpp/TestClient",
- "exit": "soft",
"protocols": [
"binary",
"compact",
@@ -51,7 +50,6 @@
"description": "Nodejs TestClient",
"lib": "nodejs",
"executable": "../lib/nodejs/test/client.js",
- "exit": "soft",
"protocols": [
"binary",
"compact",
@@ -73,7 +71,6 @@
"description": "Ruby TestClient",
"lib": "ruby",
"executable": "rb/integration/TestClient.rb",
- "exit": "soft",
"protocols": [
"binary",
"compact",
@@ -96,7 +93,6 @@
"lib": "java",
"executable": ["ant","-f","../lib/java/build.xml","-Dno-gen-thrift=\"\""],
"extra_args": ["run-testclient"],
- "exit": "soft",
"protocols": [
"binary",
"compact",
@@ -122,9 +118,8 @@
"description": "Python TSimpleServer",
"lib": "py",
"executable": "py/TestServer.py",
- "extra_args": ["TSimpleServer"],
+ "extra_args": ["--genpydir=py/gen-py", "TSimpleServer"],
"extra_delay": 0,
- "exit": "hard",
"protocols": [
"binary",
"compact",
@@ -147,7 +142,6 @@
"description": "C++ TestServer",
"lib": "cpp",
"executable": "cpp/TestServer",
- "exit": "hard",
"protocols": [
"binary",
"compact",
@@ -171,7 +165,6 @@
"description": "Ruby TestServer",
"lib": "ruby",
"executable": "rb/integration/TestServer.rb",
- "exit": "soft",
"protocols": [
"binary",
"compact",
@@ -193,7 +186,6 @@
"description": "Nodejs TestServer",
"lib": "nodejs",
"executable": "../lib/nodejs/test/server.js",
- "exit": "soft",
"protocols": [
"binary",
"compact",
@@ -216,7 +208,6 @@
"lib": "java",
"executable": ["ant","-f","../lib/java/build.xml","-Dno-gen-thrift=\"\""],
"extra_args": ["run-testserver"],
- "exit": "soft",
"protocols": [
"binary",
"compact",