diff options
| -rw-r--r-- | webkit/glue/plugins/test/SConscript | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript index 245adf7..ee9ebac 100644 --- a/webkit/glue/plugins/test/SConscript +++ b/webkit/glue/plugins/test/SConscript @@ -71,7 +71,9 @@ if env.Bit('windows'): dll = env.ChromeSharedLibrary('npapi_test_plugin', input_files) -i = env.Install('$TARGET_ROOT', dll) +# Install ourselves into the destination root so that dependent tests +# can find us. +i = env.Install('$DESTINATION_ROOT/plugins', dll) env.Alias('webkit', i) env.ChromeMSVSProject('$WEBKIT_DIR/glue/plugins/test/npapi_test_plugin.vcproj', diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 1e76559..8bf73b2 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -225,6 +225,8 @@ if env.Bit('linux'): # We need the npapi plugin stuffed into the right place. # TODO(evanm): find a cleaner way of requiring this. env.Requires(test_shell, + '$DESTINATION_ROOT/plugins/libnpapi_test_plugin.so') + env.Requires(test_shell, '$DESTINATION_ROOT/plugins/libnpapi_layout_test_plugin.so') test_files = [ @@ -273,6 +275,8 @@ test_shell_tests = env.ChromeTestProgram('test_shell_tests', resources + test_files) # We need the npapi plugin stuffed into the right place. # TODO(evanm): find a cleaner way of requiring this. +env.Requires(test_shell, + '$DESTINATION_ROOT/plugins/libnpapi_test_plugin.so') env.Requires(test_shell_tests, '$DESTINATION_ROOT/plugins/libnpapi_layout_test_plugin.so') |