diff options
author | Lukas Larsson <lukas@erlang-solutions.com> | 2012-06-08 17:33:41 +0200 |
---|---|---|
committer | Lukas Larsson <lukas@erlang-solutions.com> | 2012-06-08 17:33:41 +0200 |
commit | 1fc1233587a00b318ce15fd520b057dee726a7fc (patch) | |
tree | 1a7c446ee60b922fb11c89c930f32f55719015f1 /erts/emulator/test | |
parent | d7554d5b53ef85861bb5593fba38f65c40faca33 (diff) | |
parent | 3341122a92e71ade3edc7ecaadab9f55da29e20d (diff) | |
download | otp-1fc1233587a00b318ce15fd520b057dee726a7fc.tar.gz otp-1fc1233587a00b318ce15fd520b057dee726a7fc.tar.bz2 otp-1fc1233587a00b318ce15fd520b057dee726a7fc.zip |
Merge branch 'maint'
* maint:
Update to work with space in include path
Update to work with whitespace in exec path
Diffstat (limited to 'erts/emulator/test')
-rw-r--r-- | erts/emulator/test/Makefile | 12 | ||||
-rw-r--r-- | erts/emulator/test/bif_SUITE.erl | 2 | ||||
-rw-r--r-- | erts/emulator/test/distribution_SUITE.erl | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile index efa3cd475f..627aa01bbf 100644 --- a/erts/emulator/test/Makefile +++ b/erts/emulator/test/Makefile @@ -197,13 +197,13 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: release_tests_spec: make_emakefile - $(INSTALL_DIR) $(RELSYSDIR) + $(INSTALL_DIR) "$(RELSYSDIR)" $(INSTALL_DATA) $(EMAKEFILE) $(TEST_SPEC_FILES) \ - $(ERL_FILES) $(RELSYSDIR) - $(INSTALL_DATA) $(NO_OPT_ERL_FILES) $(RELSYSDIR) - $(INSTALL_DATA) $(NATIVE_ERL_FILES) $(RELSYSDIR) - chmod -R u+w $(RELSYSDIR) - tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -) + $(ERL_FILES) "$(RELSYSDIR)" + $(INSTALL_DATA) $(NO_OPT_ERL_FILES) "$(RELSYSDIR)" + $(INSTALL_DATA) $(NATIVE_ERL_FILES) "$(RELSYSDIR)" + chmod -R u+w "$(RELSYSDIR)" + tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -) release_docs_spec: diff --git a/erts/emulator/test/bif_SUITE.erl b/erts/emulator/test/bif_SUITE.erl index ebbd8b31c6..e2442861c7 100644 --- a/erts/emulator/test/bif_SUITE.erl +++ b/erts/emulator/test/bif_SUITE.erl @@ -74,7 +74,7 @@ display(doc) -> display(Config) when is_list(Config) -> Pa = filename:dirname(code:which(?MODULE)), {ok, Node} = test_server:start_node(display_huge_term,peer, - [{args, "-pa "++Pa}]), + [{args, "-pa \""++Pa++"\""}]), true = rpc:call(Node,?MODULE,display_huge,[]), test_server:stop_node(Node), ok. diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl index 08308629fe..2ddb4d76d9 100644 --- a/erts/emulator/test/distribution_SUITE.erl +++ b/erts/emulator/test/distribution_SUITE.erl @@ -1890,7 +1890,7 @@ start_node(Name, Args, Rel) when is_atom(Name), is_list(Rel) -> end, test_server:start_node(Name, slave, [{args, - Args++" -setcookie "++Cookie++" -pa "++Pa} + Args++" -setcookie "++Cookie++" -pa \""++Pa++"\""} | RelArg]); start_node(Config, Args, Rel) when is_list(Config), is_list(Rel) -> Name = list_to_atom((atom_to_list(?MODULE) |