Fix #125: Move test files to test/files (#126)

* Fix #125: Move test files to test/files * Remove debug * Update rebar3 for CI * Remove CI check with old rebar3 that was causing issues * The local update was doing nothing at all
AdRoll · May 17, 2021 · 9666a9f · 9666a9f
1 parent 5e84092
commit 9666a9f
Show file tree

Hide file tree

Showing 91 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -10,12 +10,14 @@ jobs:
 
     strategy:
       matrix:
-        otp: [21.3, 22.0.7, 22.3, 23.0.4, 23.2.7.0, 24.0]
+        otp: [21.3, 22.3, 23.0.4, 23.2.7.0, 24.0]
     container:
       image: erlang:${{ matrix.otp }}-alpine
 
     steps:
     - uses: actions/checkout@v2
+    - name: Check rebar3 version
+      run: rebar3 --version
     - name: Compile
       run: rebar3 compile
     - name: Format check

diff --git a/elvis.config b/elvis.config
@@ -3,7 +3,7 @@
     [#{dirs => ["src", "src/**"],
        filter => "*.erl",
        ruleset => erl_files},
-     #{dirs => ["test/**"],
+     #{dirs => ["test"], %% Don't analyze test/files
        filter => "*.erl",
        ruleset => erl_files,
        rules => [{elvis_style, no_debug_call, disable}]}]}]}].
diff --git a/priv/test_files/ignore/no_ignore.erl → test/files/ignore/no_ignore.erl b/priv/test_files/ignore/no_ignore.erl → test/files/ignore/no_ignore.erl
diff --git a/priv/test_files/ignore/no_ignore.hrl → test/files/ignore/no_ignore.hrl b/priv/test_files/ignore/no_ignore.hrl → test/files/ignore/no_ignore.hrl
diff --git a/priv/test_files/ignore/specific_ignore.erl → test/files/ignore/specific_ignore.erl b/priv/test_files/ignore/specific_ignore.erl → test/files/ignore/specific_ignore.erl
diff --git a/priv/test_files/ignore/with_ignore.erl → test/files/ignore/with_ignore.erl b/priv/test_files/ignore/with_ignore.erl → test/files/ignore/with_ignore.erl
diff --git a/priv/test_files/ignore/with_ignore.hrl → test/files/ignore/with_ignore.hrl b/priv/test_files/ignore/with_ignore.hrl → test/files/ignore/with_ignore.hrl
diff --git a/...use_hrl_attrs/lib/app/include/header1.hrl → ...use_hrl_attrs/lib/app/include/header1.hrl b/...use_hrl_attrs/lib/app/include/header1.hrl → ...use_hrl_attrs/lib/app/include/header1.hrl
diff --git a/...use_hrl_attrs/lib/app/include/header2.hrl → ...use_hrl_attrs/lib/app/include/header2.hrl b/...use_hrl_attrs/lib/app/include/header2.hrl → ...use_hrl_attrs/lib/app/include/header2.hrl
diff --git a/...use_hrl_attrs/lib/app/include/header3.hrl → ...use_hrl_attrs/lib/app/include/header3.hrl b/...use_hrl_attrs/lib/app/include/header3.hrl → ...use_hrl_attrs/lib/app/include/header3.hrl
diff --git a/..._use_hrl_attrs/lib/app/include/ignore.hrl → ..._use_hrl_attrs/lib/app/include/ignore.hrl b/..._use_hrl_attrs/lib/app/include/ignore.hrl → ..._use_hrl_attrs/lib/app/include/ignore.hrl
diff --git a/...gle_use_hrl_attrs/lib/app/src/app.app.src → ...gle_use_hrl_attrs/lib/app/src/app.app.src b/...gle_use_hrl_attrs/lib/app/src/app.app.src → ...gle_use_hrl_attrs/lib/app/src/app.app.src
diff --git a/...use_hrl_attrs/lib/app/src/app_include.erl → ...use_hrl_attrs/lib/app/src/app_include.erl b/...use_hrl_attrs/lib/app/src/app_include.erl → ...use_hrl_attrs/lib/app/src/app_include.erl
diff --git a/...hrl_attrs/lib/app/src/app_include_lib.erl → ...hrl_attrs/lib/app/src/app_include_lib.erl b/...hrl_attrs/lib/app/src/app_include_lib.erl → ...hrl_attrs/lib/app/src/app_include_lib.erl
diff --git a/...e_use_hrl_attrs/lib/app/src/app_other.erl → ...e_use_hrl_attrs/lib/app/src/app_other.erl b/...e_use_hrl_attrs/lib/app/src/app_other.erl → ...e_use_hrl_attrs/lib/app/src/app_other.erl
diff --git a/...ngle_use_hrl_attrs/lib/app/src/ignore.erl → ...ngle_use_hrl_attrs/lib/app/src/ignore.erl b/...ngle_use_hrl_attrs/lib/app/src/ignore.erl → ...ngle_use_hrl_attrs/lib/app/src/ignore.erl
diff --git a/...files/single_use_hrls/include/ignored.hrl → ...files/single_use_hrls/include/ignored.hrl b/...files/single_use_hrls/include/ignored.hrl → ...files/single_use_hrls/include/ignored.hrl
diff --git a/...t_files/single_use_hrls/include/multi.hrl → test/files/single_use_hrls/include/multi.hrl b/...t_files/single_use_hrls/include/multi.hrl → test/files/single_use_hrls/include/multi.hrl
diff --git a/..._files/single_use_hrls/include/single.hrl → .../files/single_use_hrls/include/single.hrl b/..._files/single_use_hrls/include/single.hrl → .../files/single_use_hrls/include/single.hrl
diff --git a/...ingle_use_hrls/include/single_unicode.hrl → ...ingle_use_hrls/include/single_unicode.hrl b/...ingle_use_hrls/include/single_unicode.hrl → ...ingle_use_hrls/include/single_unicode.hrl
diff --git a/...s/single_use_hrls/src/include_ignored.erl → ...s/single_use_hrls/src/include_ignored.erl b/...s/single_use_hrls/src/include_ignored.erl → ...s/single_use_hrls/src/include_ignored.erl
diff --git a/...s/single_use_hrls/src/include_missing.erl → ...s/single_use_hrls/src/include_missing.erl b/...s/single_use_hrls/src/include_missing.erl → ...s/single_use_hrls/src/include_missing.erl
diff --git a/...les/single_use_hrls/src/include_multi.erl → ...les/single_use_hrls/src/include_multi.erl b/...les/single_use_hrls/src/include_multi.erl → ...les/single_use_hrls/src/include_multi.erl
diff --git a/...es/single_use_hrls/src/include_single.erl → ...es/single_use_hrls/src/include_single.erl b/...es/single_use_hrls/src/include_single.erl → ...es/single_use_hrls/src/include_single.erl
diff --git a/...ingle_use_hrls/src/include_unicode_åö.erl → ...ingle_use_hrls/src/include_unicode_åö.erl b/...ingle_use_hrls/src/include_unicode_åö.erl → ...ingle_use_hrls/src/include_unicode_åö.erl
diff --git a/priv/test_files/test_app/another_sys.config → test/files/test_app/another_sys.config b/priv/test_files/test_app/another_sys.config → test/files/test_app/another_sys.config
diff --git a/priv/test_files/test_app/elvis.config → test/files/test_app/elvis.config b/priv/test_files/test_app/elvis.config → test/files/test_app/elvis.config
diff --git a/...es/test_app/include/a_folder/a_header.hrl → ...es/test_app/include/a_folder/a_header.hrl b/...es/test_app/include/a_folder/a_header.hrl → ...es/test_app/include/a_folder/a_header.hrl
diff --git a/.../test_files/test_app/include/a_header.hrl → test/files/test_app/include/a_header.hrl b/.../test_files/test_app/include/a_header.hrl → test/files/test_app/include/a_header.hrl
diff --git a/...ect/src/a_folder/a_subfolder/a_module.erl → ...ect/src/a_folder/a_subfolder/a_module.erl b/...ect/src/a_folder/a_subfolder/a_module.erl → ...ect/src/a_folder/a_subfolder/a_module.erl
diff --git a/priv/test_files/test_app/one_tuple.config → test/files/test_app/one_tuple.config b/priv/test_files/test_app/one_tuple.config → test/files/test_app/one_tuple.config
diff --git a/priv/test_files/test_app/rebar.config → test/files/test_app/rebar.config b/priv/test_files/test_app/rebar.config → test/files/test_app/rebar.config
diff --git a/priv/test_files/test_app/relx.config → test/files/test_app/relx.config b/priv/test_files/test_app/relx.config → test/files/test_app/relx.config
diff --git a/..._files/test_app/src/a_folder/a_module.erl → .../files/test_app/src/a_folder/a_module.erl b/..._files/test_app/src/a_folder/a_module.erl → .../files/test_app/src/a_folder/a_module.erl
diff --git a/...app/src/a_folder/a_subfolder/a_module.erl → ...app/src/a_folder/a_subfolder/a_module.erl b/...app/src/a_folder/a_subfolder/a_module.erl → ...app/src/a_folder/a_subfolder/a_module.erl
diff --git a/priv/test_files/test_app/src/a_module.erl → test/files/test_app/src/a_module.erl b/priv/test_files/test_app/src/a_module.erl → test/files/test_app/src/a_module.erl
diff --git a/.../test_files/test_app/src/test_app.app.src → test/files/test_app/src/test_app.app.src b/.../test_files/test_app/src/test_app.app.src → test/files/test_app/src/test_app.app.src
diff --git a/priv/test_files/test_app/sys.config → test/files/test_app/sys.config b/priv/test_files/test_app/sys.config → test/files/test_app/sys.config
diff --git a/...files/test_app/test/a_folder/a_module.erl → ...files/test_app/test/a_folder/a_module.erl b/...files/test_app/test/a_folder/a_module.erl → ...files/test_app/test/a_folder/a_module.erl
diff --git a/...st_files/test_app/test/a_module_SUITE.erl → test/files/test_app/test/a_module_SUITE.erl b/...st_files/test_app/test/a_module_SUITE.erl → test/files/test_app/test/a_module_SUITE.erl
diff --git a/priv/test_files/test_app/user.config → test/files/test_app/user.config b/priv/test_files/test_app/user.config → test/files/test_app/user.config
diff --git a/...ut_warnings/include/a_folder/a_header.hrl → ...ut_warnings/include/a_folder/a_header.hrl b/...ut_warnings/include/a_folder/a_header.hrl → ...ut_warnings/include/a_folder/a_header.hrl
diff --git a/...app/without_warnings/include/a_header.hrl → ...app/without_warnings/include/a_header.hrl b/...app/without_warnings/include/a_header.hrl → ...app/without_warnings/include/a_header.hrl
diff --git a/...ect/src/a_folder/a_subfolder/a_module.erl → ...ect/src/a_folder/a_subfolder/a_module.erl b/...ect/src/a_folder/a_subfolder/a_module.erl → ...ect/src/a_folder/a_subfolder/a_module.erl
diff --git a/...c/a_folder/a_subfolder/another_module.erl → ...c/a_folder/a_subfolder/another_module.erl b/...c/a_folder/a_subfolder/another_module.erl → ...c/a_folder/a_subfolder/another_module.erl
diff --git a/...ithout_warnings/src/a_folder/a_module.erl → ...ithout_warnings/src/a_folder/a_module.erl b/...ithout_warnings/src/a_folder/a_module.erl → ...ithout_warnings/src/a_folder/a_module.erl
diff --git a/...ngs/src/a_folder/a_subfolder/a_module.erl → ...ngs/src/a_folder/a_subfolder/a_module.erl b/...ngs/src/a_folder/a_subfolder/a_module.erl → ...ngs/src/a_folder/a_subfolder/a_module.erl
diff --git a/...est_app/without_warnings/src/a_module.erl → ...est_app/without_warnings/src/a_module.erl b/...est_app/without_warnings/src/a_module.erl → ...est_app/without_warnings/src/a_module.erl
diff --git a/...thout_warnings/test/a_folder/a_module.erl → ...thout_warnings/test/a_folder/a_module.erl b/...thout_warnings/test/a_folder/a_module.erl → ...thout_warnings/test/a_folder/a_module.erl
diff --git a/.../without_warnings/test/a_module_SUITE.erl → .../without_warnings/test/a_module_SUITE.erl b/.../without_warnings/test/a_module_SUITE.erl → .../without_warnings/test/a_module_SUITE.erl
diff --git a/.../unnecessary_function_arguments/clean.erl → .../unnecessary_function_arguments/clean.erl b/.../unnecessary_function_arguments/clean.erl → .../unnecessary_function_arguments/clean.erl
diff --git a/...necessary_function_arguments/ct_SUITE.erl → ...necessary_function_arguments/ct_SUITE.erl b/...necessary_function_arguments/ct_SUITE.erl → ...necessary_function_arguments/ct_SUITE.erl
diff --git a/...ary_function_arguments/gen_server_imp.erl → ...ary_function_arguments/gen_server_imp.erl b/...ary_function_arguments/gen_server_imp.erl → ...ary_function_arguments/gen_server_imp.erl
diff --git a/...unnecessary_function_arguments/ignore.erl → ...unnecessary_function_arguments/ignore.erl b/...unnecessary_function_arguments/ignore.erl → ...unnecessary_function_arguments/ignore.erl
diff --git a/...sary_function_arguments/ignore_config.erl → ...sary_function_arguments/ignore_config.erl b/...sary_function_arguments/ignore_config.erl → ...sary_function_arguments/ignore_config.erl
diff --git a/...unnecessary_function_arguments/macros.erl → ...unnecessary_function_arguments/macros.erl b/...unnecessary_function_arguments/macros.erl → ...unnecessary_function_arguments/macros.erl
diff --git a/...s/unnecessary_function_arguments/nifs.erl → ...s/unnecessary_function_arguments/nifs.erl b/...s/unnecessary_function_arguments/nifs.erl → ...s/unnecessary_function_arguments/nifs.erl
diff --git a/...ssary_function_arguments/old_ct_SUITE.erl → ...ssary_function_arguments/old_ct_SUITE.erl b/...ssary_function_arguments/old_ct_SUITE.erl → ...ssary_function_arguments/old_ct_SUITE.erl
diff --git a/...cessary_function_arguments/warnings_A.erl → ...cessary_function_arguments/warnings_A.erl b/...cessary_function_arguments/warnings_A.erl → ...cessary_function_arguments/warnings_A.erl
diff --git a/...cessary_function_arguments/warnings_B.erl → ...cessary_function_arguments/warnings_B.erl b/...cessary_function_arguments/warnings_B.erl → ...cessary_function_arguments/warnings_B.erl
diff --git a/.../unnecessary_function_arguments/weird.erl → .../unnecessary_function_arguments/weird.erl b/.../unnecessary_function_arguments/weird.erl → .../unnecessary_function_arguments/weird.erl
diff --git a/priv/test_files/unused_callbacks/clean.erl → test/files/unused_callbacks/clean.erl b/priv/test_files/unused_callbacks/clean.erl → test/files/unused_callbacks/clean.erl
diff --git a/priv/test_files/unused_callbacks/ignore.erl → test/files/unused_callbacks/ignore.erl b/priv/test_files/unused_callbacks/ignore.erl → test/files/unused_callbacks/ignore.erl
diff --git a/..._files/unused_callbacks/ignore_config.erl → .../files/unused_callbacks/ignore_config.erl b/..._files/unused_callbacks/ignore_config.erl → .../files/unused_callbacks/ignore_config.erl
diff --git a/priv/test_files/unused_callbacks/macros.erl → test/files/unused_callbacks/macros.erl b/priv/test_files/unused_callbacks/macros.erl → test/files/unused_callbacks/macros.erl
diff --git a/.../test_files/unused_callbacks/warnings.erl → test/files/unused_callbacks/warnings.erl b/.../test_files/unused_callbacks/warnings.erl → test/files/unused_callbacks/warnings.erl
diff --git a/...b/app0-with-other-name/include/header.hrl → ...b/app0-with-other-name/include/header.hrl b/...b/app0-with-other-name/include/header.hrl → ...b/app0-with-other-name/include/header.hrl
diff --git a/...lib/app0-with-other-name/src/app0.app.src → ...lib/app0-with-other-name/src/app0.app.src b/...lib/app0-with-other-name/src/app0.app.src → ...lib/app0-with-other-name/src/app0.app.src
diff --git a/...s/unused_hrls/lib/app1/include/header.hrl → ...s/unused_hrls/lib/app1/include/header.hrl b/...s/unused_hrls/lib/app1/include/header.hrl → ...s/unused_hrls/lib/app1/include/header.hrl
diff --git a/...les/unused_hrls/lib/app1/src/app1.app.src → ...les/unused_hrls/lib/app1/src/app1.app.src b/...les/unused_hrls/lib/app1/src/app1.app.src → ...les/unused_hrls/lib/app1/src/app1.app.src
diff --git a/...unused_hrls/lib/app1/src/app1_include.erl → ...unused_hrls/lib/app1/src/app1_include.erl b/...unused_hrls/lib/app1/src/app1_include.erl → ...unused_hrls/lib/app1/src/app1_include.erl
diff --git a/...ed_hrls/lib/app1/src/app1_include_lib.erl → ...ed_hrls/lib/app1/src/app1_include_lib.erl b/...ed_hrls/lib/app1/src/app1_include_lib.erl → ...ed_hrls/lib/app1/src/app1_include_lib.erl
diff --git a/...ls/lib/app1/src/app1_not_using_header.erl → ...ls/lib/app1/src/app1_not_using_header.erl b/...ls/lib/app1/src/app1_not_using_header.erl → ...ls/lib/app1/src/app1_not_using_header.erl
diff --git a/...les/unused_hrls/lib/app2/src/app2.app.src → ...les/unused_hrls/lib/app2/src/app2.app.src b/...les/unused_hrls/lib/app2/src/app2.app.src → ...les/unused_hrls/lib/app2/src/app2.app.src
diff --git a/...unused_hrls/lib/app2/src/app2_include.erl → ...unused_hrls/lib/app2/src/app2_include.erl b/...unused_hrls/lib/app2/src/app2_include.erl → ...unused_hrls/lib/app2/src/app2_include.erl
diff --git a/...ed_hrls/lib/app2/src/app2_include_lib.erl → ...ed_hrls/lib/app2/src/app2_include_lib.erl b/...ed_hrls/lib/app2/src/app2_include_lib.erl → ...ed_hrls/lib/app2/src/app2_include_lib.erl
diff --git a/...ls/lib/app2/src/app2_not_using_header.erl → ...ls/lib/app2/src/app2_not_using_header.erl b/...ls/lib/app2/src/app2_not_using_header.erl → ...ls/lib/app2/src/app2_not_using_header.erl
diff --git a/priv/test_files/unused_macros/double.erl → test/files/unused_macros/double.erl b/priv/test_files/unused_macros/double.erl → test/files/unused_macros/double.erl
diff --git a/priv/test_files/unused_macros/header.hrl → test/files/unused_macros/header.hrl b/priv/test_files/unused_macros/header.hrl → test/files/unused_macros/header.hrl
diff --git a/priv/test_files/unused_macros/ignore.erl → test/files/unused_macros/ignore.erl b/priv/test_files/unused_macros/ignore.erl → test/files/unused_macros/ignore.erl
diff --git a/...est_files/unused_macros/ignore_config.erl → test/files/unused_macros/ignore_config.erl b/...est_files/unused_macros/ignore_config.erl → test/files/unused_macros/ignore_config.erl
diff --git a/...les/unused_macros/unused_macro_sample.erl → ...les/unused_macros/unused_macro_sample.erl b/...les/unused_macros/unused_macro_sample.erl → ...les/unused_macros/unused_macro_sample.erl
diff --git a/...files/unused_macros/used_macro_sample.erl → ...files/unused_macros/used_macro_sample.erl b/...files/unused_macros/used_macro_sample.erl → ...files/unused_macros/used_macro_sample.erl
diff --git a/...est_files/unused_record_fields/header.hrl → test/files/unused_record_fields/header.hrl b/...est_files/unused_record_fields/header.hrl → test/files/unused_record_fields/header.hrl
diff --git a/...est_files/unused_record_fields/ignore.erl → test/files/unused_record_fields/ignore.erl b/...est_files/unused_record_fields/ignore.erl → test/files/unused_record_fields/ignore.erl
diff --git a/...es/unused_record_fields/ignore_config.erl → ...es/unused_record_fields/ignore_config.erl b/...es/unused_record_fields/ignore_config.erl → ...es/unused_record_fields/ignore_config.erl
diff --git a/...est_files/unused_record_fields/macros.erl → test/files/unused_record_fields/macros.erl b/...est_files/unused_record_fields/macros.erl → test/files/unused_record_fields/macros.erl
diff --git a/...ord_fields/unused_record_field_sample.erl → ...ord_fields/unused_record_field_sample.erl b/...ord_fields/unused_record_field_sample.erl → ...ord_fields/unused_record_field_sample.erl
diff --git a/...ecord_fields/used_record_field_sample.erl → ...ecord_fields/used_record_field_sample.erl b/...ecord_fields/used_record_field_sample.erl → ...ecord_fields/used_record_field_sample.erl
diff --git a/test/hank_test_utils.erl b/test/hank_test_utils.erl
@@ -56,4 +56,4 @@ set_cwd(RelativePathOrFilename) ->
 
 abs_test_path(FilePath) ->
     filename:join(
-        code:priv_dir(rebar3_hank), "test_files/" ++ FilePath).
+        code:lib_dir(rebar3_hank), "test/files/" ++ FilePath).
diff --git a/test/unused_hrls_SUITE.erl b/test/unused_hrls_SUITE.erl
@@ -55,7 +55,7 @@ local_include(_) ->
     ok =
         file:set_cwd(
             filename:join(
-                code:priv_dir(rebar3_hank), "test_files/unused_hrls/lib/app1")),
+                code:lib_dir(rebar3_hank), "test/files/unused_hrls/lib/app1")),
     OnlyApp1 =
         ["include/header.hrl", "src/app1_not_using_header.erl", "src/app1_include.erl"],
     [] = analyze(OnlyApp1),