Index: tests/srpc/nacl.scons |
=================================================================== |
--- tests/srpc/nacl.scons (revision 6583) |
+++ tests/srpc/nacl.scons (working copy) |
@@ -23,8 +23,7 @@ |
'${PTHREAD_LIBS}']) |
env.Publish(srpc_test_nexe_name, 'run', |
['srpc_basic.html', |
- 'srpc_perf.html', |
- 'srpc_test.nmf']) |
+ 'srpc_perf.html']) |
srpc_test_nonbrowser = env.ComponentProgram( |
'srpc_test_nonbrowser', srpc_test_objs, |
@@ -43,10 +42,7 @@ |
'gio', |
'm', |
'${PTHREAD_LIBS}']) |
-env.Publish(srpc_nrd_server_nexe_name, 'run', |
- ['srpc_nrd_server.nmf']) |
- |
srpc_nrd_client_nexe_name = ('srpc_nrd_client_%s' % |
env.get('TARGET_FULLARCH')) |
srpc_nrd_client_nexe = env.ComponentProgram( |
@@ -61,9 +57,7 @@ |
'${PTHREAD_LIBS}']) |
env.Publish(srpc_nrd_client_nexe_name, 'run', |
['srpc_nrd_xfer.html', |
- 'srpc_nrd_client.nmf', |
- srpc_nrd_server_nexe, |
- 'srpc_nrd_server.nmf']) |
+ srpc_nrd_server_nexe]) |
srpc_bidir_nexe_name = ('srpc_bidir_%s' % env.get('TARGET_FULLARCH')) |
@@ -112,6 +106,7 @@ |
node = env.PPAPIBrowserTester( |
'srpc_basic_chrome_browser_test.out', |
url='srpc_basic.html', |
+ nmfs=['srpc_test.nmf'], |
files=env.ExtractPublishedFiles(srpc_test_nexe_name), |
args=['--enable_experimental_js']) |
env.AddNodeToTestSuite(node, |
@@ -122,9 +117,11 @@ |
node = env.PPAPIBrowserTester( |
'srpc_nrd_xfer_chrome_browser_test.out', |
url='srpc_nrd_xfer.html', |
+ nmfs=['srpc_nrd_client.nmf', 'srpc_nrd_server.nmf'], |
files=env.ExtractPublishedFiles(srpc_nrd_client_nexe_name), |
args=['--enable_experimental_js']) |
env.AddNodeToTestSuite(node, |
['chrome_browser_tests'], |
'run_srpc_nrd_xfer_chrome_browser_test', |
- is_broken=env.PPAPIBrowserTesterIsBroken()) |
+ is_broken=env.PPAPIBrowserTesterIsBroken() or |
+ env.Bit('nacl_glibc')) |