diff options
author | Lukas Larsson <lukas@erlang-solutions.com> | 2012-11-02 15:22:59 +0100 |
---|---|---|
committer | Lukas Larsson <lukas@erlang-solutions.com> | 2012-11-02 15:22:59 +0100 |
commit | 2fac860004a2eece19c62053b3c0fd5210ca7051 (patch) | |
tree | 1abdd2c481ee4db7d7ace99746c4f32a57338ea6 /lib/test_server/src | |
parent | 985f2a9aa2460e648981bb4538eb446202d25d9d (diff) | |
parent | 045319da07722f1dd01af8c07dc1bcc196ffb137 (diff) | |
download | otp-2fac860004a2eece19c62053b3c0fd5210ca7051.tar.gz otp-2fac860004a2eece19c62053b3c0fd5210ca7051.tar.bz2 otp-2fac860004a2eece19c62053b3c0fd5210ca7051.zip |
Merge branch 'maint'
* maint:
Skip ct_netconf tests if there is no crypto
Migrate timers from test_server to ct interface
Update tests to run with an oldshell emulator
Move crypto check so that tc is skipped and not failed
Update for new version of ppc compilation chain
Verify that ebin folder of applications exists
Conflicts:
lib/asn1/test/asn1_SUITE.erl
lib/kernel/test/interactive_shell_SUITE.erl
Diffstat (limited to 'lib/test_server/src')
-rw-r--r-- | lib/test_server/src/ts.erl | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl index 1b2bd4296a..3ddc58fdbc 100644 --- a/lib/test_server/src/ts.erl +++ b/lib/test_server/src/ts.erl @@ -260,12 +260,19 @@ run(Testspec, Config) when is_atom(Testspec), is_list(Config) -> Options=check_test_get_opts(Testspec, Config), File=atom_to_list(Testspec), Spec = case code:lib_dir(Testspec) of - {error, bad_name} when Testspec /= emulator, - Testspec /= system, - Testspec /= epmd -> + _ when Testspec == emulator; + Testspec == system; + Testspec == epmd -> + File++".spec"; + {error, bad_name} -> create_skip_spec(Testspec, tests(Testspec)); - _ -> - File++".spec" + Path -> + case file:read_file_info(filename:join(Path,"ebin")) of + {ok,_} -> + File++".spec"; + _ -> + create_skip_spec(Testspec, tests(Testspec)) + end end, run_test(File, [{spec,[Spec]}], Options); %% Runs one module in a spec (interactive) |