merging

test/gsc_test_tokens.erl

@@ -121,8 +121,8 @@ concat_property(FileName, FilePath) ->
     {FileName ++ ": file = sum(tokens)",
      fun() ->
         case gsc:tokens_from_file(FileChars) of
-            {ok, SfcTokens} ->
-                ConcatStr = concat_token_strs(SfcTokens, []),
+            {ok, GscTokens} ->
+                ConcatStr = concat_token_strs(GscTokens, []),
                 ?assertEqual(FileChars, ConcatStr);
             _Error ->
                 ok

test/gsc_tests.erl

@@ -24,8 +24,8 @@ cli_args(TestNames) ->
     ts_utils:tidily(fun() -> do_gsc_test(TestNames) end).
 
 
-do_gsc_test(["-h" | _])          -> do_help();
-do_gsc_test(["--help" | _])      -> do_help();
+%do_gsc_test(["-h" | _])          -> do_help();
+%do_gsc_test(["--help" | _])      -> do_help();
 do_gsc_test(["-l" | _])          -> do_list();
 do_gsc_test(["--list" | _])      -> do_list();
 do_gsc_test(["-a" | _])          -> do_all();
@@ -35,14 +35,17 @@ do_gsc_test(["so", "tokens", X]) -> do_so_tokens(X);
 do_gsc_test(["tokenizers_agree", X]) ->
     do_tokenizers_agree(X);
 do_gsc_test([TestName]) ->
-    ts_utils:run_test_by_name(TestName);
+    case ts_utils:test_exists_by_name(TestName) of
+        true  -> ts_utils:run_test_by_name(TestName);
+        false -> gsc_cli:do_help()
+    end;
 do_gsc_test(_) ->
-    do_help().
+    gsc_cli:do_help().
 
 
 
-do_help() ->
-    io:format("go help yourself~n").
+%do_help() ->
+%    io:format("go help yourself~n").
 
 do_list() ->
     Names = ts_utils:runnable_test_names(),

test/ts_utils.erl

@@ -10,6 +10,7 @@
     load_dep/1,
     clean_after/1, tidily/1,
     delete_beams/0, tidy/0,
+    test_exists_by_name/1,
     run_test_by_name/1,
     rmm/1, run_mod_main/1,
     runnable_test_names/0,
@@ -110,6 +111,13 @@ tidy() ->
     delete_beams().
 
 
+test_exists_by_name(Name) when is_list(Name) ->
+    case find_test_by_name(Name) of
+        {good, _} -> true;
+        {bad, _}  -> true;
+        not_found -> false
+    end.
+
 -spec run_test_by_name(Name) -> Result when
         Name :: string(),
         Result :: ok.