diff options
| author | Peter Andersson <[email protected]> | 2012-03-26 14:02:45 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-26 14:02:45 +0200 |
| commit | 6e922a11b8d1cc51bdfcc9bcff9c47d46a01495e (patch) | |
| tree | 434b801d26d0e7a717f44e047fc620ec0928020e /lib/test_server/src/test_server_node.erl | |
| parent | be87b9df2c6eca8a1139269eb535150f3f9b6e62 (diff) | |
| parent | 67ccf96bb7b430e691509a45299eeee1ca5f27c5 (diff) | |
| download | otp-6e922a11b8d1cc51bdfcc9bcff9c47d46a01495e.tar.gz otp-6e922a11b8d1cc51bdfcc9bcff9c47d46a01495e.tar.bz2 otp-6e922a11b8d1cc51bdfcc9bcff9c47d46a01495e.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/test_server/src/test_server_node.erl')
| -rw-r--r-- | lib/test_server/src/test_server_node.erl | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl index 1fd40d1dd9..2cc4facc32 100644 --- a/lib/test_server/src/test_server_node.erl +++ b/lib/test_server/src/test_server_node.erl @@ -943,12 +943,23 @@ find_rel_suse_1(Rel, RootWc) -> end. find_rel_suse_2(Rel, RootWc) -> - Wc = RootWc ++ "_" ++ Rel, - case filelib:wildcard(Wc) of - [] -> - []; - [R|_] -> - [filename:join([R,"bin","erl"])] + RelDir = filename:dirname(RootWc), + Pat = filename:basename(RootWc ++ "_" ++ Rel) ++ ".*", + case file:list_dir(RelDir) of + {ok,Dirs} -> + case lists:filter(fun(Dir) -> + case re:run(Dir, Pat) of + nomatch -> false; + _ -> true + end + end, Dirs) of + [] -> + []; + [R|_] -> + [filename:join([RelDir,R,"bin","erl"])] + end; + _ -> + [] end. %% suse_release() -> VersionString | none. |