diff options
| author | Zandra Hird <[email protected]> | 2015-05-08 13:39:03 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-05-08 13:39:03 +0200 |
| commit | 48893d496c6efa9e7bc3340d451d18e8f80393c7 (patch) | |
| tree | fef8b105758a019ab72456df35f8cae027ba4aa2 | |
| parent | bf31e9c00d2024dfa011179a743952e48f8f0056 (diff) | |
| parent | b428cda36b3fc692e7feee3452cde0d76f110566 (diff) | |
| download | otp-48893d496c6efa9e7bc3340d451d18e8f80393c7.tar.gz otp-48893d496c6efa9e7bc3340d451d18e8f80393c7.tar.bz2 otp-48893d496c6efa9e7bc3340d451d18e8f80393c7.zip | |
Merge branch 'fishcakez/ct_test_dirs'
* fishcakez/ct_test_dirs:
Fix parsing list of one test directory in ct:run_test/1
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index b37baa9f3e..0eafe72020 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -1634,11 +1634,15 @@ groups_and_cases(Gs, Cs) -> tests(TestDir, Suites, []) when is_list(TestDir), is_integer(hd(TestDir)) -> [{?testdir(TestDir,Suites),ensure_atom(Suites),all}]; tests(TestDir, Suite, Cases) when is_list(TestDir), is_integer(hd(TestDir)) -> + [{?testdir(TestDir,Suite),ensure_atom(Suite),Cases}]; +tests([TestDir], Suite, Cases) when is_list(TestDir), is_integer(hd(TestDir)) -> [{?testdir(TestDir,Suite),ensure_atom(Suite),Cases}]. tests([{Dir,Suite}],Cases) -> [{?testdir(Dir,Suite),ensure_atom(Suite),Cases}]; tests(TestDir, Suite) when is_list(TestDir), is_integer(hd(TestDir)) -> - tests(TestDir, ensure_atom(Suite), all). + tests(TestDir, ensure_atom(Suite), all); +tests([TestDir], Suite) when is_list(TestDir), is_integer(hd(TestDir)) -> + tests(TestDir, ensure_atom(Suite), all). tests(DirSuites) when is_list(DirSuites), is_tuple(hd(DirSuites)) -> [{?testdir(Dir,Suite),ensure_atom(Suite),all} || {Dir,Suite} <- DirSuites]; tests(TestDir) when is_list(TestDir), is_integer(hd(TestDir)) -> |