diff options
| author | Lukas Larsson <[email protected]> | 2010-12-07 17:52:12 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-02-17 17:39:00 +0100 |
| commit | 5fef403779c4894189abf6fd18e6c8e5d54064c5 (patch) | |
| tree | d9d647a90cb7c95dcc7607d6cc2a8e58ffc8ea82 /lib/jinterface/test | |
| parent | d8a27daee264991e14def9b2e40f10c8f6d8e4d3 (diff) | |
| download | otp-5fef403779c4894189abf6fd18e6c8e5d54064c5.tar.gz otp-5fef403779c4894189abf6fd18e6c8e5d54064c5.tar.bz2 otp-5fef403779c4894189abf6fd18e6c8e5d54064c5.zip | |
Update all test specs
Diffstat (limited to 'lib/jinterface/test')
| -rw-r--r-- | lib/jinterface/test/Makefile | 2 | ||||
| -rw-r--r-- | lib/jinterface/test/jinterface.spec (renamed from lib/jinterface/test/jinterface.dynspec) | 14 | ||||
| -rw-r--r-- | lib/jinterface/test/jinterface_SUITE.erl | 9 | ||||
| -rw-r--r-- | lib/jinterface/test/nc_SUITE.erl | 13 |
4 files changed, 18 insertions, 20 deletions
diff --git a/lib/jinterface/test/Makefile b/lib/jinterface/test/Makefile index 36955d1e91..b2ddffea42 100644 --- a/lib/jinterface/test/Makefile +++ b/lib/jinterface/test/Makefile @@ -32,7 +32,7 @@ RELSYSDIR = $(RELEASE_PATH)/jinterface_test # ---------------------------------------------------- # Target Specs # ---------------------------------------------------- -TEST_SPEC_FILE = jinterface.dynspec +TEST_SPEC_FILE = jinterface.spec MODULES = nc_SUITE \ jinterface_SUITE diff --git a/lib/jinterface/test/jinterface.dynspec b/lib/jinterface/test/jinterface.spec index 44712521df..99bc0f4005 100644 --- a/lib/jinterface/test/jinterface.dynspec +++ b/lib/jinterface/test/jinterface.spec @@ -17,16 +17,4 @@ %% %% %CopyrightEnd% %% -%% You can test this file using this command. -%% file:script("jinterface.dynspec", [{'Os',"Unix"}]). - -case case code:priv_dir(jinterface) of - {error,bad_name} -> false; - P -> filelib:is_dir(P) end of - true -> - []; - false -> - NoApp = "No jinterface application", - [{skip,{nc_SUITE,NoApp}}, - {skip,{jinterface_SUITE,NoApp}}] -end. +{suites,"../jinterface_test",all}. diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl index db33059af5..b42101908e 100644 --- a/lib/jinterface/test/jinterface_SUITE.erl +++ b/lib/jinterface/test/jinterface_SUITE.erl @@ -163,7 +163,14 @@ status_handler() -> init_per_suite(Config) when is_list(Config) -> - jitu:init_all(Config). + case case code:priv_dir(jinterface) of + {error,bad_name} -> false; + P -> filelib:is_dir(P) end of + true -> + jitu:init_all(Config); + false -> + {skip,"No jinterface application"} + end. end_per_suite(Config) when is_list(Config) -> jitu:finish_all(Config). diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl index fde2fd5071..f9a588f32c 100644 --- a/lib/jinterface/test/nc_SUITE.erl +++ b/lib/jinterface/test/nc_SUITE.erl @@ -69,12 +69,15 @@ init_per_group(_GroupName, Config) -> end_per_group(_GroupName, Config) -> Config. - - - - init_per_suite(Config) when is_list(Config) -> - jitu:init_all(Config). + case case code:priv_dir(jinterface) of + {error,bad_name} -> false; + P -> filelib:is_dir(P) end of + true -> + jitu:init_all(Config); + false -> + {skip,"No jinterface application"} + end. end_per_suite(Config) -> jitu:finish_all(Config). |