more renaming

cli/src/gs_test_tokens.erl

@@ -1,5 +1,5 @@
 % gsc tokenizer tests
--module(tsfp_gsc_tokenizer).
+-module(gs_test_tokens).
 
 -export([
     main/0, ct_dir/0
@@ -17,7 +17,7 @@ main() ->
 
 % directory containing the tests for the tokenizer
 ct_dir() ->
-    zx_daemon:get_home() ++ "/test-data/gt_tokens".
+    zx_daemon:get_home() ++ "/ct/".
 
 agreement_tests_dir() ->
     ct_dir() ++ "/tokenizers_agree".
@@ -129,7 +129,7 @@ concat_property(FileName, FilePath) ->
         end
      end}.
 
-concat_token_strs([#gsc_token{string = S} | Rest], Acc) ->
+concat_token_strs([#tk{str = S} | Rest], Acc) ->
      concat_token_strs(Rest, [Acc, S]);
 concat_token_strs([], Acc) ->
     unicode:characters_to_nfc_list(Acc).

cli/src/gsc_cli.erl

@@ -40,9 +40,12 @@ do(["list"]) ->
     do_tlist();
 do(["list", "tests"]) ->
     do_tlist();
+do(["test"]) ->
+    do_tests();
+do(["tests"]) ->
+    do_tests();
 do(["run", "tests"]) ->
-    io:format("TestModules = ~p~n", [known_modules_with_prefix("ts")]),
+    do_tests();
-    do_runall_tests();
 do(["tokenizers_agree", Foo]) ->
     io:format("~p~n", [tokenizers_agree(Foo)]);
 % slowly phasing out shitty names like lctokens
@@ -70,12 +73,15 @@ do_doi() ->
     Cmd = "less " ++ FP,
     io:format("~s~n", [Cmd]).
 
+do_tests() ->
+    io:format("TestModules = ~p~n", [known_modules_with_prefix("ts")]),
+    do_runall_tests().
 
 do_runall_tests() ->
     lists:foreach(fun run_mod_main/1, test_mods()).
 
 test_mods() ->
-    known_modules_with_prefix("gt_").
+    known_modules_with_prefix("gs_test").
 
 known_modules_with_prefix(Pfx) ->
     ModsZipBeamsZipLoaded = code:all_available(),