Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ppapi.patch

Issue 7745047: Enable browser tests with glibc. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « buildbot/patch.py ('k') | tests/browser_startup_time/nacl.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi.patch
===================================================================
--- ppapi.patch (revision 0)
+++ ppapi.patch (revision 0)
@@ -0,0 +1,955 @@
+Index: native_client/tests/ppapi_example_gles2/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_example_gles2/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_example_gles2/nacl.scons (working copy)
+@@ -8,8 +8,9 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
+-
+ env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
++ 'ppapi_example_gles2/')
+
+ nexe_name = 'ppapi_example_gles2_%s' % env.get('TARGET_FULLARCH')
+ obj = env.ComponentObject(
+@@ -21,10 +22,11 @@
+
+ # Note that the html is required to run this program.
+ env.Publish(nexe_name, 'run',
+- ['ppapi_example_gles2.html', 'ppapi_example_gles2.nmf'])
++ ['ppapi_example_gles2.html'])
+
+ test = env.PPAPIBrowserTester('ppapi_example_gles2_test.out',
+ url='ppapi_example_gles2.html',
++ nmfs=['${TEST_DIR}/ppapi_example_gles2.nmf'],
+ files=env.ExtractPublishedFiles(nexe_name),
+ args=['--enable_experimental_js'])
+
+@@ -34,4 +36,4 @@
+ # TODO(cstefansen): When fixed set to
+ # env.PPAPIBrowserTesterIsBroken().
+ # code.google.com/p/nativeclient/issues/detail?id=1936
+- is_broken=True)
++ is_broken=env.Bit('nacl_glibc'))
+Index: native_client/tests/ppapi_test_example/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_test_example/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_test_example/nacl.scons (working copy)
+@@ -17,6 +17,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
++ 'ppapi_test_example/')
+
+ nexe = 'ppapi_test_example_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_test_example${PROGSUFFIX}',
+@@ -34,11 +36,11 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_test_example.html',
+- 'ppapi_test_example.nmf',
+ 'ppapi_test_example.js'])
+
+ node = env.PPAPIBrowserTester('ppapi_test_example_browser_test.out',
+ url='ppapi_test_example.html',
++ nmfs=['${TEST_DIR}/ppapi_test_example.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_geturl/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_geturl/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_geturl/nacl.scons (working copy)
+@@ -17,6 +17,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
++ 'ppapi_geturl/')
+
+ nexe = 'ppapi_geturl_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_geturl${PROGSUFFIX}',
+@@ -46,11 +48,11 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_geturl.html',
+- 'ppapi_geturl.nmf',
+ 'ppapi_geturl_success.html'])
+
+ node = env.PPAPIBrowserTester('ppapi_geturl_browser_test.out',
+ url='ppapi_geturl.html',
++ nmfs=['${TEST_DIR}/ppapi_geturl.nmf'],
+ files=env.ExtractPublishedFiles(nexe),
+ args=['--allow_404'],
+ )
+@@ -58,5 +60,5 @@
+ env.AddNodeToTestSuite(node,
+ ['chrome_browser_tests'],
+ 'run_ppapi_geturl_browser_test',
+- is_broken=env.PPAPIBrowserTesterIsBroken()
+- )
++ is_broken=env.PPAPIBrowserTesterIsBroken() or
++ env.Bit('nacl_glibc'))
+Index: native_client/tests/ppapi_example_post_message/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_example_post_message/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_example_post_message/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
++ 'ppapi_example_post_message/')
+
+ nexe_name = 'ppapi_example_post_message_${TARGET_FULLARCH}'
+ obj = env.ComponentObject(
+@@ -19,13 +21,13 @@
+
+ # Note that the html is required to run this program.
+ env.Publish(nexe_name, 'run',
+- ['ppapi_example_post_message.html',
+- 'ppapi_example_post_message.nmf'])
++ ['ppapi_example_post_message.html'])
+
+
+ test = env.PPAPIBrowserTester(
+ 'ppapi_example_post_message_test.out',
+ url='ppapi_example_post_message.html',
++ nmfs=['${TEST_DIR}/ppapi_example_post_message.nmf'],
+ files=env.ExtractPublishedFiles(nexe_name))
+
+ env.AddNodeToTestSuite(test,
+Index: native_client/tests/ppapi_gles_book/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_gles_book/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_gles_book/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
++ 'ppapi_gles_book/')
+
+ # Underlay $SOURCE_ROOT/gpu in this directory.
+ Dir('.').addRepository(Dir('#/../gpu'))
+@@ -68,13 +70,12 @@
+ 'ppapi_gles2',
+ 'm'])
+ env.Publish(nexe_name, 'run',
+- ['ppapi_gles_book.html',
+- nmf_name])
++ ['ppapi_gles_book.html'])
+ test = env.PPAPIBrowserTester(
+ 'ppapi_gles_book_' + demo + '.out',
+ url='ppapi_gles_book.html?manifest=' + nmf_name,
++ nmfs=['${TEST_DIR}/' + nmf_name],
+ files=[nexe,
+- env.File(nmf_name),
+ env.File('ppapi_gles_book.html')],
+ browser_flags=['--enable-accelerated-plugins'])
+ env.AddNodeToTestSuite(
+Index: native_client/tests/ppapi_example_audio/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_example_audio/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_example_audio/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
++ 'ppapi_example_audio/')
+
+ nexe_name = 'ppapi_example_audio_%s' % env.get('TARGET_FULLARCH')
+ nexe = env.ComponentProgram(nexe_name,
+@@ -21,10 +23,11 @@
+
+ # Note that the html is required to run this program.
+ env.Publish(nexe_name, 'run',
+- ['ppapi_example_audio.html' , 'ppapi_example_audio.nmf'])
++ ['ppapi_example_audio.html'])
+
+ test = env.PPAPIBrowserTester('ppapi_example_audio_test.out',
+ url='ppapi_example_audio.html#mute',
++ nmfs=['${TEST_DIR}/ppapi_example_audio.nmf'],
+ files=[nexe,
+ env.File('ppapi_example_audio.nmf'),
+ env.File('ppapi_example_audio.html')])
+Index: native_client/tests/ppapi_messaging/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_messaging/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_messaging/nacl.scons (working copy)
+@@ -13,6 +13,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
++ 'ppapi_messaging/')
+
+ nexe = 'ppapi_messaging_%s' % env.get('TARGET_FULLARCH')
+
+@@ -31,7 +33,6 @@
+ # Note that the html is required to run this program.
+ dest_copy = env.Replicate('$STAGING_DIR',
+ ['ppapi_messaging.html',
+- 'ppapi_messaging.nmf',
+ env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
+ 'browserdata/nacltest.js')]
+ )
+@@ -39,6 +40,7 @@
+
+ node = env.PPAPIBrowserTester('ppapi_messaging_browser_test.out',
+ url='ppapi_messaging.html',
++ nmfs=['${TEST_DIR}/ppapi_messaging.nmf'],
+ files=[ppapi_messaging_nexe,
+ env.File('ppapi_messaging.nmf'),
+ env.File('ppapi_messaging.html')])
+Index: native_client/tests/ppapi_example_font/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_example_font/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_example_font/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
++ 'ppapi_example_font/')
+
+ # Adjust compiler flags to the more forgiving standards used in
+ # ppapi/examples/*.
+@@ -24,10 +26,11 @@
+
+ # Note that the html is required to run this program.
+ env.Publish(nexe_name, 'run',
+- ['ppapi_example_font.html', 'ppapi_example_font.nmf'])
++ ['ppapi_example_font.html'])
+
+ test = env.PPAPIBrowserTester('ppapi_example_font_test.out',
+ url='ppapi_example_font.html',
++ nmfs=['${TEST_DIR}/ppapi_example_font.nmf'],
+ files=env.ExtractPublishedFiles(nexe_name))
+
+ env.AddNodeToTestSuite(test,
+Index: native_client/tests/ppapi_browser/ppp_input_event/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppp_input_event/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppp_input_event/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppp_input_event')
+
+ nexe = 'ppapi_ppp_input_event_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppp_input_event${PROGSUFFIX}',
+@@ -25,11 +27,11 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_ppp_input_event.html',
+- 'ppapi_ppp_input_event.nmf',
+ 'ppapi_ppp_input_event.js'])
+
+ node = env.PPAPIBrowserTester('ppapi_ppp_input_event_browser_test.out',
+ url='ppapi_ppp_input_event.html',
++ nmfs=['${TEST_DIR}/ppapi_ppp_input_event.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_browser/ppb_dev/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_dev/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_dev/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_dev')
+
+ nexe = 'ppapi_ppb_dev_${TARGET_FULLARCH}'
+ env.Alias('ppapi_ppb_dev${PROGSUFFIX}',
+@@ -25,12 +27,12 @@
+
+ env.Publish(nexe, 'run',
+ [ 'ppapi_ppb_dev.html',
+- 'ppapi_ppb_dev.nmf',
+ env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
+ 'browserdata/nacltest.js') ])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_dev_browser_test.out',
+ url='ppapi_ppb_dev.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_dev.nmf'],
+ files=env.ExtractPublishedFiles(nexe),
+ args=['--enable_ppapi_dev=0'])
+
+Index: native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons (working copy)
+@@ -13,6 +13,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'extension_mime_handler')
+
+ nexe = 'ppapi_extension_mime_handler_%s' % env.get('TARGET_FULLARCH')
+
+@@ -27,9 +29,11 @@
+
+ # Copy the extension into place (as a subdir in the staging dir).
+ dest_copy = env.Replicate('$STAGING_DIR/ppapi_extension_mime_handler',
+- ['ppapi_extension_mime_handler.nmf',
+- 'manifest.json',
++ ['manifest.json',
+ env.File('$STAGING_DIR/' + nexe + '$PROGSUFFIX')])
++dest_copy.append(env.CopyLibsForExtension(
++ '$STAGING_DIR/ppapi_extension_mime_handler',
++ '$STAGING_DIR/ppapi_extension_mime_handler.nmf'))
+
+ env.Depends(env.Alias(nexe), dest_copy)
+
+@@ -40,6 +44,7 @@
+
+ node = env.PPAPIBrowserTester('ppapi_extension_mime_handler.out',
+ url='ppapi_extension_mime_handler.html',
++ nmfs=['${TEST_DIR}/ppapi_extension_mime_handler.nmf'],
+ extensions=[env.Dir('$STAGING_DIR/ppapi_extension_mime_handler')],
+ files=env.ExtractPublishedFiles(nexe))
+
+Index: native_client/tests/ppapi_browser/ppp_instance/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppp_instance/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppp_instance/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppp_instance')
+
+ nexe = 'ppapi_ppp_instance_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppp_instance${PROGSUFFIX}',
+@@ -25,11 +27,11 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_ppp_instance.html',
+- 'ppapi_ppp_instance.nmf',
+ 'ppapi_ppp_instance.js'])
+
+ node = env.PPAPIBrowserTester('ppapi_ppp_instance_browser_test.out',
+ url='ppapi_ppp_instance.html',
++ nmfs=['${TEST_DIR}/ppapi_ppp_instance.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_browser/ppb_widget/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_widget/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_widget/nacl.scons (working copy)
+@@ -7,6 +7,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_widget')
+
+ nexe = 'ppapi_ppb_widget_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_widget${PROGSUFFIX}',
+@@ -24,11 +26,11 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_widget.html',
+- 'ppapi_ppb_widget.nmf',
+ 'ppapi_ppb_widget.js'])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_widget_browser_test.out',
+ url='ppapi_ppb_widget.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_widget.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_browser/ppb_file_system/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_file_system/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_file_system/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_file_system')
+
+ nexe = 'ppapi_ppb_file_system_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_file_system${PROGSUFFIX}',
+@@ -23,14 +25,15 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_file_system.html',
+- 'ppapi_ppb_file_system.nmf',
+ 'ppapi_ppb_file_system.js'])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_file_system_browser_test.out',
+ url='ppapi_ppb_file_system.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_file_system.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+ ['chrome_browser_tests'],
+ 'run_ppapi_ppb_file_system_browser_test',
+- is_broken=env.PPAPIBrowserTesterIsBroken())
++ is_broken=env.PPAPIBrowserTesterIsBroken() or
++ env.Bit('nacl_glibc'))
+Index: native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons (working copy)
+@@ -7,6 +7,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_scrollbar')
+
+ nexe = 'ppapi_ppb_scrollbar_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_scrollbar${PROGSUFFIX}',
+@@ -24,11 +26,11 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_scrollbar.html',
+- 'ppapi_ppb_scrollbar.nmf',
+ 'ppapi_ppb_scrollbar.js'])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_scrollbar_browser_test.out',
+ url='ppapi_ppb_scrollbar.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_scrollbar.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_url_request_info')
+
+ nexe = 'ppapi_ppb_url_request_info_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_url_request_info${PROGSUFFIX}',
+@@ -25,13 +27,14 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_url_request_info.html',
+- 'ppapi_ppb_url_request_info.nmf',
+ 'ppapi_ppb_url_request_info.js'])
+
+-node = env.PPAPIBrowserTester('ppapi_ppb_url_request_info_browser_test.out',
+- url='ppapi_ppb_url_request_info.html',
+- files=env.ExtractPublishedFiles(nexe),
+- browser_flags=['--enable-pepper-testing'])
++node = env.PPAPIBrowserTester(
++ 'ppapi_ppb_url_request_info_browser_test.out',
++ url='ppapi_ppb_url_request_info.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_url_request_info.nmf'],
++ files=env.ExtractPublishedFiles(nexe),
++ browser_flags=['--enable-pepper-testing'])
+
+ env.AddNodeToTestSuite(node,
+ ['chrome_browser_tests'],
+Index: native_client/tests/ppapi_browser/bad/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/bad/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/bad/nacl.scons (working copy)
+@@ -18,6 +18,8 @@
+ # TODO(robertm): those should not be necessary once we go -std=c99
+ env.FilterOut(CFLAGS=['-pedantic'])
+ env.FilterOut(CCFLAGS=['-pedantic'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'bad')
+
+ ppapi_bad_files = [
+ 'ppapi_bad.html',
+@@ -32,7 +34,7 @@
+ ]
+ ppapi_bad = env.Replicate('${STAGING_DIR}', ppapi_bad_files)
+
+-
++nmfs = []
+ # Compile all nexes embedded into the above html
+ for kind in [ 'ppp_initialize', 'ppp_initialize_crash',
+ 'no_ppp_instance', 'get_ppp_instance_crash',
+@@ -40,7 +42,7 @@
+ 'ppp_instance_didcreate', 'ppp_instance_didcreate_crash',
+ 'event_replay_crash'
+ ]:
+- bad_nmf = 'ppapi_bad_%s.nmf' % kind
++ bad_nmf = '${TEST_DIR}/ppapi_bad_%s.nmf' % kind
+ bad_nexe = ('ppapi_bad_%s_%s' % (kind, env.get('TARGET_FULLARCH')))
+ env.ComponentProgram(bad_nexe,
+ ['ppapi_bad_%s.cc' % kind],
+@@ -48,8 +50,7 @@
+ 'platform',
+ 'pthread',
+ 'gio'])
+-
+- env.Publish(bad_nexe, 'run', [bad_nmf])
++ nmfs.append(bad_nmf)
+ ppapi_bad_files.extend(env.ExtractPublishedFiles(bad_nexe))
+ env.Depends(ppapi_bad, env.Alias(bad_nexe))
+
+@@ -60,21 +61,21 @@
+ node = env.PPAPIBrowserTester(
+ 'ppapi_bad_browser_test.out',
+ url='ppapi_bad.html',
++ nmfs=nmfs,
+ files=[env.File(f) for f in ppapi_bad_files],
+ args=['--allow_404'])
+
+ env.AddNodeToTestSuite(node,
+ ['chrome_browser_tests'],
+ 'run_ppapi_bad_browser_test',
+- is_broken=env.PPAPIBrowserTesterIsBroken())
++ is_broken=env.PPAPIBrowserTesterIsBroken() or
++ env.Bit('nacl_glibc'))
+
+
+ # Bad nexe tests that won't work in PNaCl (native)
+ # For example, partly_invalid.nexe has inline assembly in its source files.
+-
+ ppapi_bad_native_files = [
+ env.File('ppapi_bad_native.html'),
+- env.File('partly_invalid.nmf'),
+ env.File('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
+ 'ppapi_progress_events.js'),
+ env.File('${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js')
+@@ -88,11 +89,13 @@
+ node = env.PPAPIBrowserTester(
+ 'ppapi_bad_native_test.out',
+ url='ppapi_bad_native.html',
++ nmfs=['${TEST_DIR}/partly_invalid.nmf'],
+ files=ppapi_bad_native_files,
+ )
+
+ env.AddNodeToTestSuite(node,
+ ['chrome_browser_tests'],
+- 'run_ppapi_bad_native_test',
+- is_broken=env.PPAPIBrowserTesterIsBroken() or
+- env.Bit('bitcode'))
++ 'run_ppapi_bad_native_test',
++ is_broken=env.PPAPIBrowserTesterIsBroken() or
++ env.Bit('nacl_glibc') or
++ env.Bit('bitcode'))
+Index: native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_graphics2d')
+
+ nexe = 'ppapi_ppb_graphics2d_${TARGET_FULLARCH}'
+ env.Alias('ppapi_ppb_graphics2d${PROGSUFFIX}',
+@@ -25,15 +27,14 @@
+
+ dest_copy = env.Publish(nexe, 'run',
+ [ 'ppapi_ppb_graphics2d.html',
+- 'ppapi_ppb_graphics2d.nmf',
+ env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
+ 'browserdata/nacltest.js') ]
+ )
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_graphics2d_browser_test.out',
+ url='ppapi_ppb_graphics2d.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_graphics2d.nmf'],
+ files=[ ppapi_ppb_graphics2d_nexe,
+- env.File('ppapi_ppb_graphics2d.nmf'),
+ env.File('ppapi_ppb_graphics2d.html')],
+ browser_flags=['--enable-pepper-testing'])
+
+Index: native_client/tests/ppapi_browser/progress_events/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/progress_events/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/progress_events/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ # TODO(robertm): those should not be necessary once we go -std=c99
+ env.FilterOut(CFLAGS=['-pedantic'])
+ env.FilterOut(CCFLAGS=['-pedantic'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'progress_events')
+
+ progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'),
+
+@@ -24,7 +26,6 @@
+ # Needed by other tests using progress events.
+ env.Publish(progress_events_target, 'run', [
+ 'ppapi_progress_events.html',
+- 'ppapi_progress_events.nmf',
+ ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
+ 'ppapi_progress_events.js'),
+ '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js',
+@@ -33,6 +34,7 @@
+ node = env.PPAPIBrowserTester(
+ 'ppapi_progress_events_browser_test.out',
+ url='ppapi_progress_events.html',
++ nmfs=['${TEST_DIR}/ppapi_progress_events.nmf'],
+ files=env.ExtractPublishedFiles(progress_events_target))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_graphics3d')
+
+ env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
+
+@@ -28,14 +30,13 @@
+
+ dest_copy = env.Publish(nexe, 'run',
+ [ 'ppapi_ppb_graphics3d.html',
+- 'ppapi_ppb_graphics3d.nmf',
+ env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
+ 'browserdata/nacltest.js') ])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_graphics3d_browser_test.out',
+ url='ppapi_ppb_graphics3d.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_graphics3d.nmf'],
+ files=[ ppapi_ppb_graphics3d_nexe,
+- env.File('ppapi_ppb_graphics3d.nmf'),
+ env.File('ppapi_ppb_graphics3d.html')],
+ browser_flags=['--enable-accelerated-plugins'])
+
+Index: native_client/tests/ppapi_browser/ppb_var/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_var/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_var/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_var')
+
+ nexe = 'ppapi_ppb_var_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_var${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
+@@ -24,12 +26,12 @@
+ # Note that the html is required to run this program.
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_var.html',
+- 'ppapi_ppb_var.nmf',
+ env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
+ 'browserdata/nacltest.js')])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_var_browser_test.out',
+ url='ppapi_ppb_var.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_var.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_browser/ppb_core/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_core/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_core/nacl.scons (working copy)
+@@ -8,9 +8,12 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_core')
+
+ nexe = 'ppapi_ppb_core_%s' % env.get('TARGET_FULLARCH')
+-env.Alias('ppapi_ppb_core${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
++env.Alias('ppapi_ppb_core${PROGSUFFIX}',
++ ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
+
+ env.ComponentProgram(
+ nexe,
+@@ -24,15 +27,16 @@
+ # Note that the html is required to run this program.
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_core.html',
+- 'ppapi_ppb_core.nmf',
+ env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
+ 'browserdata/nacltest.js')])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_core_browser_test.out',
+ url='ppapi_ppb_core.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_core.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+ ['chrome_browser_tests'],
+ 'run_ppapi_ppb_core_browser_test',
+- is_broken=env.PPAPIBrowserTesterIsBroken())
++ is_broken=env.PPAPIBrowserTesterIsBroken() or
++ env.Bit('nacl_glibc'))
+Index: native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_url_loader')
+
+ nexe = 'ppapi_ppb_url_loader_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_url_loader${PROGSUFFIX}',
+@@ -23,12 +25,12 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_url_loader.html',
+- 'ppapi_ppb_url_loader.nmf',
+ 'ppapi_ppb_url_loader.js',
+ 'ppapi_ppb_url_loader.txt'])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_url_loader_browser_test.out',
+ url='ppapi_ppb_url_loader.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_url_loader.nmf'],
+ files=env.ExtractPublishedFiles(nexe),
+ args=['--allow_404',
+ '--redirect_url',
+Index: native_client/tests/ppapi_browser/crash/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/crash/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/crash/nacl.scons (working copy)
+@@ -11,10 +11,13 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(
++ TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/crash')
+
+ crash_types = ['via_check_failure', 'via_exit_call', 'in_callback']
+ published_files = []
+
++nmfs = []
+ for crash_type in crash_types:
+ nexe = 'ppapi_crash_%s_%s' % (crash_type, env.get('TARGET_FULLARCH'))
+ env.Alias('ppapi_crash_%s${PROGSUFFIX}' % crash_type,
+@@ -32,17 +35,19 @@
+ # TODO(polina): follow ppapi_browser/bad nacl.scons to publish html only once
+ # and to associate all nexes and nmf files with one target that can be
+ # referenced in tests/nacl.scons.
++ nmfs.append('${TEST_DIR}/ppapi_crash_%s.nmf' % crash_type)
+ env.Publish(nexe, 'run',
+- ['ppapi_crash.html',
+- 'ppapi_crash_%s.nmf' % crash_type ])
++ ['ppapi_crash.html'])
+
+ published_files.extend(env.ExtractPublishedFiles(nexe))
+
+ node = env.PPAPIBrowserTester('ppapi_crash_browser_test.out',
+ url='ppapi_crash.html',
++ nmfs=nmfs,
+ files=published_files)
+
+ env.AddNodeToTestSuite(node,
+ ['chrome_browser_tests'],
+ 'run_ppapi_crash_browser_test',
+- is_broken=env.PPAPIBrowserTesterIsBroken())
++ is_broken=env.PPAPIBrowserTesterIsBroken() or
++ env.Bit('nacl_glibc'))
+Index: native_client/tests/ppapi_browser/ppb_instance/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_instance/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_instance/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_instance')
+
+ nexe = 'ppapi_ppb_instance_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_instance${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
+@@ -24,12 +26,12 @@
+ # Note that the html is required to run this program.
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_instance.html',
+- 'ppapi_ppb_instance.nmf',
+ env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
+ 'browserdata/nacltest.js')])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_instance_browser_test.out',
+ url='ppapi_ppb_instance.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_instance.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_browser/manifest/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/manifest/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/manifest/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ # TODO(robertm): those should not be necessary once we go -std=c99
+ env.FilterOut(CFLAGS=['-pedantic'])
+ env.FilterOut(CCFLAGS=['-pedantic'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'manifest')
+
+ manifest_good_sources = env.ComponentObject('manifest_good.cc'),
+
+@@ -36,26 +38,31 @@
+ env.Publish(manifest_good_target, 'run', [
+ 'manifest.html',
+ manifest_bad_target,
+- 'manifest_top.nmf',
+- 'manifest_subdir.nmf',
+ ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
+ 'ppapi_progress_events.js'),
+ '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js',
+ ])
+
++file_mapping = []
++if env.Bit('nacl_glibc'):
++ file_mapping.append(
++ ('subdir/runnable-ld.so',env.File('${NACL_SDK_LIB}/runnable-ld.so')))
++file_mapping += [
++ ('subdir/manifest_subdir.nmf',
++ env.File('${STAGING_DIR}/manifest_subdir.nmf')),
++ # the 'good' nexe in the root directory will fail.
++ (manifest_good_target + env['PROGSUFFIX'],
++ env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_bad_target)),
++ # the 'good' nexe in the subdirectory will succeed.
++ ('subdir/' + manifest_good_target + env['PROGSUFFIX'],
++ env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_good_target))]
++
+ node = env.PPAPIBrowserTester(
+ 'manifest_browser_test.out',
+ url='manifest.html',
++ nmfs=['${TEST_DIR}/manifest_top.nmf', '${TEST_DIR}/manifest_subdir.nmf'],
+ files=env.ExtractPublishedFiles(manifest_good_target),
+- map_files=[
+- ('subdir/manifest_subdir.nmf',
+- env.File('${STAGING_DIR}/manifest_subdir.nmf')),
+- # the 'good' nexe in the root directory will fail.
+- (manifest_good_target + env['PROGSUFFIX'],
+- env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_bad_target)),
+- # the 'good' nexe in the subdirectory will succeed.
+- ('subdir/' + manifest_good_target + env['PROGSUFFIX'],
+- env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_good_target))])
++ map_files=file_mapping)
+
+ env.AddNodeToTestSuite(node,
+ ['chrome_browser_tests'],
+Index: native_client/tests/ppapi_browser/ppb_file_io/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_file_io/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_file_io/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_file_io')
+
+ nexe = 'ppapi_ppb_file_io_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_file_io${PROGSUFFIX}',
+@@ -28,11 +30,11 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_file_io.html',
+- 'ppapi_ppb_file_io.nmf',
+ 'ppapi_ppb_file_io.js'])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_file_io_browser_test.out',
+ url='ppapi_ppb_file_io.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_file_io.nmf'],
+ browser_flags=['--unlimited-quota-for-files'],
+ files=env.ExtractPublishedFiles(nexe))
+
+Index: native_client/tests/ppapi_browser/ppb_memory/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_memory/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_memory/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_memory')
+
+ nexe = 'ppapi_ppb_memory_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_memory${PROGSUFFIX}',
+@@ -24,11 +26,11 @@
+ ])
+
+ env.Publish(nexe, 'run',
+- ['ppapi_ppb_memory.html',
+- 'ppapi_ppb_memory.nmf'])
++ ['ppapi_ppb_memory.html'])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_memory_browser_test.out',
+ url='ppapi_ppb_memory.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_memory.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_browser/ppb_pdf/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_pdf/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_pdf/nacl.scons (working copy)
+@@ -7,6 +7,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_pdf')
+
+ nexe = 'ppapi_ppb_pdf_%s' % env.get('TARGET_FULLARCH')
+ env.Alias('ppapi_ppb_pdf${PROGSUFFIX}',
+@@ -24,11 +26,11 @@
+
+ env.Publish(nexe, 'run',
+ ['ppapi_ppb_pdf.html',
+- 'ppapi_ppb_pdf.nmf',
+ 'ppapi_ppb_pdf.js'])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_pdf_browser_test.out',
+ url='ppapi_ppb_pdf.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_pdf.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
+Index: native_client/tests/ppapi_browser/ppb_image_data/nacl.scons
+===================================================================
+--- native_client/tests/ppapi_browser/ppb_image_data/nacl.scons (revision 98181)
++++ native_client/tests/ppapi_browser/ppb_image_data/nacl.scons (working copy)
+@@ -8,6 +8,8 @@
+ Import('env')
+
+ env.Prepend(CPPDEFINES=['XP_UNIX'])
++env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
++ 'ppb_image_data')
+
+ nexe = 'ppapi_ppb_image_data_${TARGET_FULLARCH}'
+ env.Alias('ppapi_ppb_image_data${PROGSUFFIX}',
+@@ -25,12 +27,12 @@
+
+ env.Publish(nexe, 'run',
+ [ 'ppapi_ppb_image_data.html',
+- 'ppapi_ppb_image_data.nmf',
+ env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
+ 'browserdata/nacltest.js') ])
+
+ node = env.PPAPIBrowserTester('ppapi_ppb_image_data_browser_test.out',
+ url='ppapi_ppb_image_data.html',
++ nmfs=['${TEST_DIR}/ppapi_ppb_image_data.nmf'],
+ files=env.ExtractPublishedFiles(nexe))
+
+ env.AddNodeToTestSuite(node,
« no previous file with comments | « buildbot/patch.py ('k') | tests/browser_startup_time/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698