From ac831b8fa037da15f39764c7d9e6a42f547ede1d Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Thu, 10 Oct 2024 16:59:44 +0200 Subject: [PATCH 1/2] Move ounit_tests to tests folder --- compiler/dune | 2 +- dune | 2 +- tests/dune | 1 + {compiler => tests}/ounit_tests/dune | 0 {compiler => tests}/ounit_tests/ounit_array_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_bal_tree_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_bsb_pkg_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_bsb_regex_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_data_random.ml | 0 {compiler => tests}/ounit_tests/ounit_hash_set_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_hash_stubs_test.ml | 0 {compiler => tests}/ounit_tests/ounit_hashtbl_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_ident_mask_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_int_vec_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_js_regex_checker_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_json_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_list_test.ml | 0 {compiler => tests}/ounit_tests/ounit_map_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_path_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_scc_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_string_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_tests_main.ml | 0 {compiler => tests}/ounit_tests/ounit_tests_main.mli | 0 {compiler => tests}/ounit_tests/ounit_tests_util.ml | 0 {compiler => tests}/ounit_tests/ounit_topsort_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_unicode_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_union_find_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_utf8_test.ml | 0 {compiler => tests}/ounit_tests/ounit_util_tests.ml | 0 {compiler => tests}/ounit_tests/ounit_vec_test.ml | 0 30 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 tests/dune rename {compiler => tests}/ounit_tests/dune (100%) rename {compiler => tests}/ounit_tests/ounit_array_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_bal_tree_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_bsb_pkg_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_bsb_regex_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_data_random.ml (100%) rename {compiler => tests}/ounit_tests/ounit_hash_set_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_hash_stubs_test.ml (100%) rename {compiler => tests}/ounit_tests/ounit_hashtbl_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_ident_mask_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_int_vec_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_js_regex_checker_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_json_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_list_test.ml (100%) rename {compiler => tests}/ounit_tests/ounit_map_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_path_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_scc_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_string_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_tests_main.ml (100%) rename {compiler => tests}/ounit_tests/ounit_tests_main.mli (100%) rename {compiler => tests}/ounit_tests/ounit_tests_util.ml (100%) rename {compiler => tests}/ounit_tests/ounit_topsort_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_unicode_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_union_find_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_utf8_test.ml (100%) rename {compiler => tests}/ounit_tests/ounit_util_tests.ml (100%) rename {compiler => tests}/ounit_tests/ounit_vec_test.ml (100%) diff --git a/compiler/dune b/compiler/dune index 97b3d99fdd..101b4b8acf 100644 --- a/compiler/dune +++ b/compiler/dune @@ -1,5 +1,5 @@ (dirs bsb bsb_exe bsb_helper bsb_helper_exe bsc cmij common core depends ext - frontend gentype jsoo js_parser ml ounit_tests syntax) + frontend gentype jsoo js_parser ml syntax) (env (dev diff --git a/dune b/dune index a2dde03ccd..f4b1eadb7b 100644 --- a/dune +++ b/dune @@ -1 +1 @@ -(dirs compiler) +(dirs compiler tests) diff --git a/tests/dune b/tests/dune new file mode 100644 index 0000000000..2b0951af4a --- /dev/null +++ b/tests/dune @@ -0,0 +1 @@ +(dirs ounit_tests) diff --git a/compiler/ounit_tests/dune b/tests/ounit_tests/dune similarity index 100% rename from compiler/ounit_tests/dune rename to tests/ounit_tests/dune diff --git a/compiler/ounit_tests/ounit_array_tests.ml b/tests/ounit_tests/ounit_array_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_array_tests.ml rename to tests/ounit_tests/ounit_array_tests.ml diff --git a/compiler/ounit_tests/ounit_bal_tree_tests.ml b/tests/ounit_tests/ounit_bal_tree_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_bal_tree_tests.ml rename to tests/ounit_tests/ounit_bal_tree_tests.ml diff --git a/compiler/ounit_tests/ounit_bsb_pkg_tests.ml b/tests/ounit_tests/ounit_bsb_pkg_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_bsb_pkg_tests.ml rename to tests/ounit_tests/ounit_bsb_pkg_tests.ml diff --git a/compiler/ounit_tests/ounit_bsb_regex_tests.ml b/tests/ounit_tests/ounit_bsb_regex_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_bsb_regex_tests.ml rename to tests/ounit_tests/ounit_bsb_regex_tests.ml diff --git a/compiler/ounit_tests/ounit_data_random.ml b/tests/ounit_tests/ounit_data_random.ml similarity index 100% rename from compiler/ounit_tests/ounit_data_random.ml rename to tests/ounit_tests/ounit_data_random.ml diff --git a/compiler/ounit_tests/ounit_hash_set_tests.ml b/tests/ounit_tests/ounit_hash_set_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_hash_set_tests.ml rename to tests/ounit_tests/ounit_hash_set_tests.ml diff --git a/compiler/ounit_tests/ounit_hash_stubs_test.ml b/tests/ounit_tests/ounit_hash_stubs_test.ml similarity index 100% rename from compiler/ounit_tests/ounit_hash_stubs_test.ml rename to tests/ounit_tests/ounit_hash_stubs_test.ml diff --git a/compiler/ounit_tests/ounit_hashtbl_tests.ml b/tests/ounit_tests/ounit_hashtbl_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_hashtbl_tests.ml rename to tests/ounit_tests/ounit_hashtbl_tests.ml diff --git a/compiler/ounit_tests/ounit_ident_mask_tests.ml b/tests/ounit_tests/ounit_ident_mask_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_ident_mask_tests.ml rename to tests/ounit_tests/ounit_ident_mask_tests.ml diff --git a/compiler/ounit_tests/ounit_int_vec_tests.ml b/tests/ounit_tests/ounit_int_vec_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_int_vec_tests.ml rename to tests/ounit_tests/ounit_int_vec_tests.ml diff --git a/compiler/ounit_tests/ounit_js_regex_checker_tests.ml b/tests/ounit_tests/ounit_js_regex_checker_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_js_regex_checker_tests.ml rename to tests/ounit_tests/ounit_js_regex_checker_tests.ml diff --git a/compiler/ounit_tests/ounit_json_tests.ml b/tests/ounit_tests/ounit_json_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_json_tests.ml rename to tests/ounit_tests/ounit_json_tests.ml diff --git a/compiler/ounit_tests/ounit_list_test.ml b/tests/ounit_tests/ounit_list_test.ml similarity index 100% rename from compiler/ounit_tests/ounit_list_test.ml rename to tests/ounit_tests/ounit_list_test.ml diff --git a/compiler/ounit_tests/ounit_map_tests.ml b/tests/ounit_tests/ounit_map_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_map_tests.ml rename to tests/ounit_tests/ounit_map_tests.ml diff --git a/compiler/ounit_tests/ounit_path_tests.ml b/tests/ounit_tests/ounit_path_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_path_tests.ml rename to tests/ounit_tests/ounit_path_tests.ml diff --git a/compiler/ounit_tests/ounit_scc_tests.ml b/tests/ounit_tests/ounit_scc_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_scc_tests.ml rename to tests/ounit_tests/ounit_scc_tests.ml diff --git a/compiler/ounit_tests/ounit_string_tests.ml b/tests/ounit_tests/ounit_string_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_string_tests.ml rename to tests/ounit_tests/ounit_string_tests.ml diff --git a/compiler/ounit_tests/ounit_tests_main.ml b/tests/ounit_tests/ounit_tests_main.ml similarity index 100% rename from compiler/ounit_tests/ounit_tests_main.ml rename to tests/ounit_tests/ounit_tests_main.ml diff --git a/compiler/ounit_tests/ounit_tests_main.mli b/tests/ounit_tests/ounit_tests_main.mli similarity index 100% rename from compiler/ounit_tests/ounit_tests_main.mli rename to tests/ounit_tests/ounit_tests_main.mli diff --git a/compiler/ounit_tests/ounit_tests_util.ml b/tests/ounit_tests/ounit_tests_util.ml similarity index 100% rename from compiler/ounit_tests/ounit_tests_util.ml rename to tests/ounit_tests/ounit_tests_util.ml diff --git a/compiler/ounit_tests/ounit_topsort_tests.ml b/tests/ounit_tests/ounit_topsort_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_topsort_tests.ml rename to tests/ounit_tests/ounit_topsort_tests.ml diff --git a/compiler/ounit_tests/ounit_unicode_tests.ml b/tests/ounit_tests/ounit_unicode_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_unicode_tests.ml rename to tests/ounit_tests/ounit_unicode_tests.ml diff --git a/compiler/ounit_tests/ounit_union_find_tests.ml b/tests/ounit_tests/ounit_union_find_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_union_find_tests.ml rename to tests/ounit_tests/ounit_union_find_tests.ml diff --git a/compiler/ounit_tests/ounit_utf8_test.ml b/tests/ounit_tests/ounit_utf8_test.ml similarity index 100% rename from compiler/ounit_tests/ounit_utf8_test.ml rename to tests/ounit_tests/ounit_utf8_test.ml diff --git a/compiler/ounit_tests/ounit_util_tests.ml b/tests/ounit_tests/ounit_util_tests.ml similarity index 100% rename from compiler/ounit_tests/ounit_util_tests.ml rename to tests/ounit_tests/ounit_util_tests.ml diff --git a/compiler/ounit_tests/ounit_vec_test.ml b/tests/ounit_tests/ounit_vec_test.ml similarity index 100% rename from compiler/ounit_tests/ounit_vec_test.ml rename to tests/ounit_tests/ounit_vec_test.ml From 043360b75fc5a17372b020d28a20ab9595b9ffcf Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Thu, 10 Oct 2024 18:31:09 +0200 Subject: [PATCH 2/2] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f163672b6..ef10dbd75e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ - Run `build_tests` on Windows. https://github.com/rescript-lang/rescript-compiler/pull/7065 - Rename folder "jscomp" to "compiler". https://github.com/rescript-lang/rescript-compiler/pull/7086 - Disable -bs-cross-module-opt for tests. https://github.com/rescript-lang/rescript-compiler/pull/7071 +- Move `ounit_tests` into the `tests` folder. https://github.com/rescript-lang/rescript-compiler/pull/7096 # 12.0.0-alpha.3