aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ic
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2012-11-21 10:43:38 +0100
committerRaimo Niskanen <[email protected]>2012-11-26 09:26:12 +0100
commit87b4ec9a0b2e4bbe1180e8a26700072f49303508 (patch)
treee23d1cfcd7bbcebe058f607f4e89199555f90019 /lib/ic
parent1ecc870573b37491e9dd7965d29d20efea557c01 (diff)
downloadotp-87b4ec9a0b2e4bbe1180e8a26700072f49303508.tar.gz
otp-87b4ec9a0b2e4bbe1180e8a26700072f49303508.tar.bz2
otp-87b4ec9a0b2e4bbe1180e8a26700072f49303508.zip
Fix erroneous skipping for jinterface, erl_interface and ic
Diffstat (limited to 'lib/ic')
-rw-r--r--lib/ic/test/java_client_erl_server_SUITE.erl11
-rw-r--r--lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src2
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/ic/test/java_client_erl_server_SUITE.erl b/lib/ic/test/java_client_erl_server_SUITE.erl
index c2bec94697..9e49305c3c 100644
--- a/lib/ic/test/java_client_erl_server_SUITE.erl
+++ b/lib/ic/test/java_client_erl_server_SUITE.erl
@@ -62,9 +62,14 @@ init_per_suite(Config) when is_list(Config) ->
case case code:priv_dir(jinterface) of
{error,bad_name} ->
false;
- P ->
- filelib:is_dir(P)
- end
+ P ->
+ case filelib:wildcard(filename:join(P, "*.jar")) of
+ [_|_] ->
+ true;
+ [] ->
+ false
+ end
+ end
of
true ->
case find_executable(["java"]) of
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 ac8f2e619f..3143ab427b 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
@@ -68,7 +68,7 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
@IFEQ@ (@jinterface_classpath@,)
all:
-@ELSE
+@ELSE@
all: $(CLASS_FILES) $(EBINS)
@ENDIF@