aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-09-10 10:52:54 +0200
committerLukas Larsson <[email protected]>2012-09-10 10:52:54 +0200
commit0d297680b28e6ac398f212cbccf1f0b704a5a921 (patch)
tree4851333cb3b93ff63f9518df7bede5e52ad1d14c
parentba69fe53d60386c31852b8114d35eef5d2852bfe (diff)
parent1c0608f29558697ec9521467a5f6e632f94a302d (diff)
downloadotp-0d297680b28e6ac398f212cbccf1f0b704a5a921.tar.gz
otp-0d297680b28e6ac398f212cbccf1f0b704a5a921.tar.bz2
otp-0d297680b28e6ac398f212cbccf1f0b704a5a921.zip
Merge branch 'maint'
* maint: Do not build jinterface test if there is no jinterface Escape whitespace in path
-rw-r--r--lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src5
-rw-r--r--lib/jinterface/test/jitu.erl12
2 files changed, 13 insertions, 4 deletions
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
index c106261efd..ac8f2e619f 100644
--- a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
@@ -66,8 +66,11 @@ CLASS_FILES = $(JAVA_FILES:.java=.class)
ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
-
+@IFEQ@ (@jinterface_classpath@,)
+all:
+@ELSE
all: $(CLASS_FILES) $(EBINS)
+@ENDIF@
$(GEN_ERL_FILES) $(GEN_HRL_FILES): java_erl_test.built_erl
$(GEN_JAVA_FILES): java_erl_test.built_java
diff --git a/lib/jinterface/test/jitu.erl b/lib/jinterface/test/jitu.erl
index c57fb9bfad..fb262cf9d7 100644
--- a/lib/jinterface/test/jitu.erl
+++ b/lib/jinterface/test/jitu.erl
@@ -89,13 +89,19 @@ classpath(Dir) ->
{win32, _} -> ";";
_ -> ":"
end,
- Dir++PS++
+ es(Dir++PS++
filename:join([code:lib_dir(jinterface),"priv","OtpErlang.jar"])++PS++
case os:getenv("CLASSPATH") of
false -> "";
Classpath -> Classpath
- end.
-
+ end).
+
+es(L) ->
+ lists:flatmap(fun($ ) ->
+ "\\ ";
+ (C) ->
+ [C]
+ end,lists:flatten(L)).
cmd(Cmd) ->
PortOpts = [{line,80},eof,exit_status,stderr_to_stdout],