From 87b4ec9a0b2e4bbe1180e8a26700072f49303508 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Wed, 21 Nov 2012 10:43:38 +0100 Subject: Fix erroneous skipping for jinterface, erl_interface and ic --- lib/ic/test/java_client_erl_server_SUITE.erl | 11 ++++++++--- lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'lib/ic') 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@ -- cgit v1.2.3