diff --git a/cli/test-data/gt_syntax/aegora_base_contract-1.aes b/cli/ct/aegora_base_contract-1.aes similarity index 100% rename from cli/test-data/gt_syntax/aegora_base_contract-1.aes rename to cli/ct/aegora_base_contract-1.aes diff --git a/cli/test-data/gt_syntax/aegora_sales_contract-1.aes b/cli/ct/aegora_sales_contract-1.aes similarity index 100% rename from cli/test-data/gt_syntax/aegora_sales_contract-1.aes rename to cli/ct/aegora_sales_contract-1.aes diff --git a/cli/test-data/gt_syntax/evil.aes b/cli/ct/evil.aes similarity index 100% rename from cli/test-data/gt_syntax/evil.aes rename to cli/ct/evil.aes diff --git a/cli/test-data/gt_syntax/gym.aes b/cli/ct/gym.aes similarity index 100% rename from cli/test-data/gt_syntax/gym.aes rename to cli/ct/gym.aes diff --git a/cli/test-data/gt_syntax/hello.aes b/cli/ct/hello.aes similarity index 100% rename from cli/test-data/gt_syntax/hello.aes rename to cli/ct/hello.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/ak_base58_char.aes b/cli/ct/tokenizers_agree/ak_base58_char.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/ak_base58_char.aes rename to cli/ct/tokenizers_agree/ak_base58_char.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/ak_base58_digit_0.aes b/cli/ct/tokenizers_agree/ak_base58_digit_0.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/ak_base58_digit_0.aes rename to cli/ct/tokenizers_agree/ak_base58_digit_0.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/ak_base58_five_split.aes b/cli/ct/tokenizers_agree/ak_base58_five_split.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/ak_base58_five_split.aes rename to cli/ct/tokenizers_agree/ak_base58_five_split.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/ak_base58_hex.aes b/cli/ct/tokenizers_agree/ak_base58_hex.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/ak_base58_hex.aes rename to cli/ct/tokenizers_agree/ak_base58_hex.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/ak_base58_kwd_let.aes b/cli/ct/tokenizers_agree/ak_base58_kwd_let.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/ak_base58_kwd_let.aes rename to cli/ct/tokenizers_agree/ak_base58_kwd_let.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/ak_base58_lower_l.aes b/cli/ct/tokenizers_agree/ak_base58_lower_l.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/ak_base58_lower_l.aes rename to cli/ct/tokenizers_agree/ak_base58_lower_l.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/ak_base58_tvar.aes b/cli/ct/tokenizers_agree/ak_base58_tvar.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/ak_base58_tvar.aes rename to cli/ct/tokenizers_agree/ak_base58_tvar.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/ct_base58_upper_O.aes b/cli/ct/tokenizers_agree/ct_base58_upper_O.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/ct_base58_upper_O.aes rename to cli/ct/tokenizers_agree/ct_base58_upper_O.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div01_bytes.aes b/cli/ct/tokenizers_agree/div01_bytes.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div01_bytes.aes rename to cli/ct/tokenizers_agree/div01_bytes.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div02_char_hex_lower.aes b/cli/ct/tokenizers_agree/div02_char_hex_lower.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div02_char_hex_lower.aes rename to cli/ct/tokenizers_agree/div02_char_hex_lower.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div03_char_hexbrace_lower.aes b/cli/ct/tokenizers_agree/div03_char_hexbrace_lower.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div03_char_hexbrace_lower.aes rename to cli/ct/tokenizers_agree/div03_char_hexbrace_lower.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div04_multiline_string.aes b/cli/ct/tokenizers_agree/div04_multiline_string.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div04_multiline_string.aes rename to cli/ct/tokenizers_agree/div04_multiline_string.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div05_bcom_eof.aes b/cli/ct/tokenizers_agree/div05_bcom_eof.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div05_bcom_eof.aes rename to cli/ct/tokenizers_agree/div05_bcom_eof.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div06_bcom_in_expr.aes b/cli/ct/tokenizers_agree/div06_bcom_in_expr.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div06_bcom_in_expr.aes rename to cli/ct/tokenizers_agree/div06_bcom_in_expr.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div07_bcom_nested.aes b/cli/ct/tokenizers_agree/div07_bcom_nested.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div07_bcom_nested.aes rename to cli/ct/tokenizers_agree/div07_bcom_nested.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div08_bcom_simple.aes b/cli/ct/tokenizers_agree/div08_bcom_simple.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div08_bcom_simple.aes rename to cli/ct/tokenizers_agree/div08_bcom_simple.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div09_str_bslash_nl.aes b/cli/ct/tokenizers_agree/div09_str_bslash_nl.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div09_str_bslash_nl.aes rename to cli/ct/tokenizers_agree/div09_str_bslash_nl.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div10_char_nonascii.aes b/cli/ct/tokenizers_agree/div10_char_nonascii.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div10_char_nonascii.aes rename to cli/ct/tokenizers_agree/div10_char_nonascii.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div11_char_high_codepoint.aes b/cli/ct/tokenizers_agree/div11_char_high_codepoint.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div11_char_high_codepoint.aes rename to cli/ct/tokenizers_agree/div11_char_high_codepoint.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div12_string_high_codepoint.aes b/cli/ct/tokenizers_agree/div12_string_high_codepoint.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div12_string_high_codepoint.aes rename to cli/ct/tokenizers_agree/div12_string_high_codepoint.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div13_col_drift_2byte_str.aes b/cli/ct/tokenizers_agree/div13_col_drift_2byte_str.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div13_col_drift_2byte_str.aes rename to cli/ct/tokenizers_agree/div13_col_drift_2byte_str.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div14_col_drift_3byte_str.aes b/cli/ct/tokenizers_agree/div14_col_drift_3byte_str.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div14_col_drift_3byte_str.aes rename to cli/ct/tokenizers_agree/div14_col_drift_3byte_str.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div15_col_drift_4byte_str.aes b/cli/ct/tokenizers_agree/div15_col_drift_4byte_str.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div15_col_drift_4byte_str.aes rename to cli/ct/tokenizers_agree/div15_col_drift_4byte_str.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div16_col_drift_bcom.aes b/cli/ct/tokenizers_agree/div16_col_drift_bcom.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div16_col_drift_bcom.aes rename to cli/ct/tokenizers_agree/div16_col_drift_bcom.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/div17_col_drift_multi.aes b/cli/ct/tokenizers_agree/div17_col_drift_multi.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/div17_col_drift_multi.aes rename to cli/ct/tokenizers_agree/div17_col_drift_multi.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/id_quotes.aes b/cli/ct/tokenizers_agree/id_quotes.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/id_quotes.aes rename to cli/ct/tokenizers_agree/id_quotes.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/naked_ak.aes b/cli/ct/tokenizers_agree/naked_ak.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/naked_ak.aes rename to cli/ct/tokenizers_agree/naked_ak.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/sg_base58_underscore.aes b/cli/ct/tokenizers_agree/sg_base58_underscore.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/sg_base58_underscore.aes rename to cli/ct/tokenizers_agree/sg_base58_underscore.aes diff --git a/cli/test-data/gt_tokens/tokenizers_agree/sg_base58_upper_I.aes b/cli/ct/tokenizers_agree/sg_base58_upper_I.aes similarity index 100% rename from cli/test-data/gt_tokens/tokenizers_agree/sg_base58_upper_I.aes rename to cli/ct/tokenizers_agree/sg_base58_upper_I.aes diff --git a/cli/test-data/gt_syntax/types.aes b/cli/ct/types.aes similarity index 100% rename from cli/test-data/gt_syntax/types.aes rename to cli/ct/types.aes diff --git a/cli/src/gt_tokens.erl b/cli/src/gs_test_tokens.erl similarity index 97% rename from cli/src/gt_tokens.erl rename to cli/src/gs_test_tokens.erl index 9a5878f..86299fc 100644 --- a/cli/src/gt_tokens.erl +++ b/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). diff --git a/cli/src/gsc_cli.erl b/cli/src/gsc_cli.erl index d1cadc3..d87b235 100644 --- a/cli/src/gsc_cli.erl +++ b/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_runall_tests(); + do_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(),