Merge pull request #6558 from jschear/js/move_cli_testing_examples

Move cli_testing_examples under crates/cli/tests
roc-lang · Mar 8, 2024 · c217456 · c217456
2 parents 7d51d2b + 291647c
commit c217456
Show file tree

Hide file tree

Showing 41 changed files with 36 additions and 37 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,7 +33,6 @@ exclude = [
   "ci/benchmarks/bench-runner",
   "ci/repl_basic_test",
   # Examples sometimes have Rust hosts in their platforms. The compiler should ignore those.
-  "crates/cli_testing_examples",
   "examples",
 ]
 # Needed to be able to run `cargo run -p roc_cli --no-default-features` -

diff --git a/ci/benchmarks/bench-runner/src/main.rs b/ci/benchmarks/bench-runner/src/main.rs
@@ -87,7 +87,10 @@ fn do_all_benches(nr_repeat_benchmarks: usize) -> HashSet<String> {
         return HashSet::new();
     }
 
-    println!("\n\nDoing benchmarks {:?} times to reduce flukes.\n\n", nr_repeat_benchmarks);
+    println!(
+        "\n\nDoing benchmarks {:?} times to reduce flukes.\n\n",
+        nr_repeat_benchmarks
+    );
 
     for _ in 1..nr_repeat_benchmarks {
         delete_old_bench_results();
@@ -111,19 +114,16 @@ fn do_all_benches(nr_repeat_benchmarks: usize) -> HashSet<String> {
 
 // returns Vec with names of regressed benchmarks
 fn do_benchmark(branch_name: &'static str) -> HashSet<String> {
-    let mut bench_cmd = 
-        Command::new(format!(
-            "./bench-folder-{}/target/release/deps/time_bench",
-            branch_name
-        ));
+    let mut bench_cmd = Command::new(format!(
+        "./bench-folder-{}/target/release/deps/time_bench",
+        branch_name
+    ));
 
-    let bench_cmd_w_args =
-        bench_cmd.args(&["--bench", "--noplot"]);
+    let bench_cmd_w_args = bench_cmd.args(&["--bench", "--noplot"]);
 
     let bench_cmd_as_str = format!("{bench_cmd_w_args:?}");
 
-    let mut bench_cmd_child = 
-        bench_cmd_w_args
+    let mut bench_cmd_child = bench_cmd_w_args
         .stdout(Stdio::piped())
         .stderr(Stdio::inherit())
         .spawn()
@@ -163,8 +163,7 @@ fn do_benchmark(branch_name: &'static str) -> HashSet<String> {
             "Error: time-bench execution failed with exit code {}.\n\
             See output above for error info.\n\
             Command was:\n\t{}",
-            exit_status, 
-            bench_cmd_as_str
+            exit_status, bench_cmd_as_str
         );
     }
 
@@ -220,7 +219,7 @@ fn sha_file(file_path: &Path) -> Result<String, io::Error> {
     assert!(disassembly_output.status.success());
 
     let mut reader = BufReader::new(disassembly_output.stdout.as_slice());
-    
+
     // the first line contains the path, we want to skip it
     let mut _discard_lines = String::new();
     reader.read_line(&mut _discard_lines)?;
@@ -265,7 +264,7 @@ fn calc_hashes_for_folder(benches_path_str: &str) -> HashMap<String, String> {
 }
 
 fn check_if_bench_executables_changed() -> bool {
-    let bench_folder_str = "/crates/cli_testing_examples/benchmarks/";
+    let bench_folder_str = "/crates/cli/tests/benchmarks/";
 
     let main_benches_path_str = [BENCH_FOLDER_MAIN, bench_folder_str].join("");
 

diff --git a/ci/benchmarks/prep_folder.sh b/ci/benchmarks/prep_folder.sh
@@ -11,11 +11,11 @@ BENCH_SUFFIX=$1
 
 cargo criterion -V
 cd crates/cli && cargo criterion --no-run && cd ../..
-mkdir -p bench-folder/crates/cli_testing_examples/benchmarks
+mkdir -p bench-folder/crates/cli/tests/benchmarks
 mkdir -p bench-folder/crates/compiler/builtins/bitcode/src
 mkdir -p bench-folder/target/release/deps
-cp "crates/cli_testing_examples/benchmarks/"*".roc" bench-folder/crates/cli_testing_examples/benchmarks/
-cp -r crates/cli_testing_examples/benchmarks/platform bench-folder/crates/cli_testing_examples/benchmarks/
+cp "crates/cli/tests/benchmarks/"*".roc" bench-folder/crates/cli/tests/benchmarks/
+cp -r crates/cli/tests/benchmarks/platform bench-folder/crates/cli/tests/benchmarks/
 cp crates/compiler/builtins/bitcode/src/str.zig bench-folder/crates/compiler/builtins/bitcode/src
 cp target/release/roc bench-folder/target/release
 

diff --git a/...cli_testing_examples/algorithms/README.md → crates/cli/tests/algorithms/README.md b/...cli_testing_examples/algorithms/README.md → crates/cli/tests/algorithms/README.md
diff --git a/...es/algorithms/fibonacci-platform/host.zig → ...ts/algorithms/fibonacci-platform/host.zig b/...es/algorithms/fibonacci-platform/host.zig → ...ts/algorithms/fibonacci-platform/host.zig
diff --git a/...es/algorithms/fibonacci-platform/main.roc → ...ts/algorithms/fibonacci-platform/main.roc b/...es/algorithms/fibonacci-platform/main.roc → ...ts/algorithms/fibonacci-platform/main.roc
diff --git a/...testing_examples/algorithms/fibonacci.roc → crates/cli/tests/algorithms/fibonacci.roc b/...testing_examples/algorithms/fibonacci.roc → crates/cli/tests/algorithms/fibonacci.roc
diff --git a/...es/algorithms/quicksort-platform/host.zig → ...ts/algorithms/quicksort-platform/host.zig b/...es/algorithms/quicksort-platform/host.zig → ...ts/algorithms/quicksort-platform/host.zig
diff --git a/...es/algorithms/quicksort-platform/main.roc → ...ts/algorithms/quicksort-platform/main.roc b/...es/algorithms/quicksort-platform/main.roc → ...ts/algorithms/quicksort-platform/main.roc
diff --git a/...testing_examples/algorithms/quicksort.roc → crates/cli/tests/algorithms/quicksort.roc b/...testing_examples/algorithms/quicksort.roc → crates/cli/tests/algorithms/quicksort.roc
diff --git a/...cli_testing_examples/benchmarks/AStar.roc → crates/cli/tests/benchmarks/AStar.roc b/...cli_testing_examples/benchmarks/AStar.roc → crates/cli/tests/benchmarks/AStar.roc
diff --git a/...li_testing_examples/benchmarks/Base64.roc → crates/cli/tests/benchmarks/Base64.roc b/...li_testing_examples/benchmarks/Base64.roc → crates/cli/tests/benchmarks/Base64.roc
diff --git a/...ing_examples/benchmarks/Base64/Decode.roc → ...es/cli/tests/benchmarks/Base64/Decode.roc b/...ing_examples/benchmarks/Base64/Decode.roc → ...es/cli/tests/benchmarks/Base64/Decode.roc
diff --git a/...ing_examples/benchmarks/Base64/Encode.roc → ...es/cli/tests/benchmarks/Base64/Encode.roc b/...ing_examples/benchmarks/Base64/Encode.roc → ...es/cli/tests/benchmarks/Base64/Encode.roc
diff --git a/...ting_examples/benchmarks/Bytes/Decode.roc → crates/cli/tests/benchmarks/Bytes/Decode.roc b/...ting_examples/benchmarks/Bytes/Decode.roc → crates/cli/tests/benchmarks/Bytes/Decode.roc
diff --git a/...ting_examples/benchmarks/Bytes/Encode.roc → crates/cli/tests/benchmarks/Bytes/Encode.roc b/...ting_examples/benchmarks/Bytes/Encode.roc → crates/cli/tests/benchmarks/Bytes/Encode.roc
diff --git a/...ing_examples/benchmarks/Issue2279Help.roc → ...es/cli/tests/benchmarks/Issue2279Help.roc b/...ing_examples/benchmarks/Issue2279Help.roc → ...es/cli/tests/benchmarks/Issue2279Help.roc
diff --git a/...testing_examples/benchmarks/Quicksort.roc → crates/cli/tests/benchmarks/Quicksort.roc b/...testing_examples/benchmarks/Quicksort.roc → crates/cli/tests/benchmarks/Quicksort.roc
diff --git a/...cli_testing_examples/benchmarks/cFold.roc → crates/cli/tests/benchmarks/cFold.roc b/...cli_testing_examples/benchmarks/cFold.roc → crates/cli/tests/benchmarks/cFold.roc
diff --git a/...i_testing_examples/benchmarks/closure.roc → crates/cli/tests/benchmarks/closure.roc b/...i_testing_examples/benchmarks/closure.roc → crates/cli/tests/benchmarks/closure.roc
diff --git a/...cli_testing_examples/benchmarks/deriv.roc → crates/cli/tests/benchmarks/deriv.roc b/...cli_testing_examples/benchmarks/deriv.roc → crates/cli/tests/benchmarks/deriv.roc
diff --git a/...testing_examples/benchmarks/issue2279.roc → crates/cli/tests/benchmarks/issue2279.roc b/...testing_examples/benchmarks/issue2279.roc → crates/cli/tests/benchmarks/issue2279.roc
diff --git a/...i_testing_examples/benchmarks/nQueens.roc → crates/cli/tests/benchmarks/nQueens.roc b/...i_testing_examples/benchmarks/nQueens.roc → crates/cli/tests/benchmarks/nQueens.roc
diff --git a/...g_examples/benchmarks/platform/Effect.roc → .../cli/tests/benchmarks/platform/Effect.roc b/...g_examples/benchmarks/platform/Effect.roc → .../cli/tests/benchmarks/platform/Effect.roc
diff --git a/...ing_examples/benchmarks/platform/Task.roc → ...es/cli/tests/benchmarks/platform/Task.roc b/...ing_examples/benchmarks/platform/Task.roc → ...es/cli/tests/benchmarks/platform/Task.roc
diff --git a/...ing_examples/benchmarks/platform/host.zig → ...es/cli/tests/benchmarks/platform/host.zig b/...ing_examples/benchmarks/platform/host.zig → ...es/cli/tests/benchmarks/platform/host.zig
diff --git a/...ing_examples/benchmarks/platform/main.roc → ...es/cli/tests/benchmarks/platform/main.roc b/...ing_examples/benchmarks/platform/main.roc → ...es/cli/tests/benchmarks/platform/main.roc
diff --git a/...ting_examples/benchmarks/quicksortApp.roc → crates/cli/tests/benchmarks/quicksortApp.roc b/...ting_examples/benchmarks/quicksortApp.roc → crates/cli/tests/benchmarks/quicksortApp.roc
diff --git a/..._testing_examples/benchmarks/rBTreeCk.roc → crates/cli/tests/benchmarks/rBTreeCk.roc b/..._testing_examples/benchmarks/rBTreeCk.roc → crates/cli/tests/benchmarks/rBTreeCk.roc
diff --git a/...testing_examples/benchmarks/rBTreeDel.roc → crates/cli/tests/benchmarks/rBTreeDel.roc b/...testing_examples/benchmarks/rBTreeDel.roc → crates/cli/tests/benchmarks/rBTreeDel.roc
diff --git a/...ting_examples/benchmarks/rBTreeInsert.roc → crates/cli/tests/benchmarks/rBTreeInsert.roc b/...ting_examples/benchmarks/rBTreeInsert.roc → crates/cli/tests/benchmarks/rBTreeInsert.roc
diff --git a/...testing_examples/benchmarks/testAStar.roc → crates/cli/tests/benchmarks/testAStar.roc b/...testing_examples/benchmarks/testAStar.roc → crates/cli/tests/benchmarks/testAStar.roc
diff --git a/...esting_examples/benchmarks/testBase64.roc → crates/cli/tests/benchmarks/testBase64.roc b/...esting_examples/benchmarks/testBase64.roc → crates/cli/tests/benchmarks/testBase64.roc
diff --git a/crates/cli/tests/cli_run.rs b/crates/cli/tests/cli_run.rs
@@ -547,14 +547,14 @@ mod cli_run {
         // on the building of the platform
 
         test_roc_app(
-            "crates/cli_testing_examples/expects",
+            "crates/cli/tests/expects",
             "expects.roc",
             &[],
             &[],
             &[],
             indoc!(
                 r#"
-                ── EXPECT FAILED in ...roc/roc/crates/cli_testing_examples/expects/expects.roc ─
+                ── EXPECT FAILED in tests/expects/expects.roc ──────────────────────────────────
 
                 This expectation failed:
 
@@ -580,14 +580,14 @@ mod cli_run {
         );
 
         test_roc_app(
-            "crates/cli_testing_examples/expects",
+            "crates/cli/tests/expects",
             "expects.roc",
             &[],
             &[],
             &[],
             indoc!(
                 r#"
-                ── EXPECT FAILED in ...roc/roc/crates/cli_testing_examples/expects/expects.roc ─
+                ── EXPECT FAILED in tests/expects/expects.roc ──────────────────────────────────
 
                 This expectation failed:
 
@@ -599,7 +599,7 @@ mod cli_run {
                 a : Num *
                 a = 1
 
-                ── EXPECT FAILED in ...roc/roc/crates/cli_testing_examples/expects/expects.roc ─
+                ── EXPECT FAILED in tests/expects/expects.roc ──────────────────────────────────
 
                 This expectation failed:
 
@@ -611,7 +611,7 @@ mod cli_run {
                 a : Num *
                 a = 1
 
-                ── EXPECT FAILED in ...roc/roc/crates/cli_testing_examples/expects/expects.roc ─
+                ── EXPECT FAILED in tests/expects/expects.roc ──────────────────────────────────
 
                 This expectation failed:
 
@@ -659,7 +659,7 @@ mod cli_run {
     )]
     fn fibonacci() {
         test_roc_app_slim(
-            "crates/cli_testing_examples/algorithms",
+            "crates/cli/tests/algorithms",
             "fibonacci.roc",
             "",
             UseValgrind::Yes,
@@ -698,7 +698,7 @@ mod cli_run {
     #[cfg_attr(windows, ignore)]
     fn quicksort() {
         test_roc_app_slim(
-            "crates/cli_testing_examples/algorithms",
+            "crates/cli/tests/algorithms",
             "quicksort.roc",
             "[0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2]\n",
             UseValgrind::Yes,

diff --git a/.../cli_testing_examples/expects/expects.roc → crates/cli/tests/expects/expects.roc b/.../cli_testing_examples/expects/expects.roc → crates/cli/tests/expects/expects.roc
diff --git a/...ng_examples/expects/zig-platform/host.zig → ...s/cli/tests/expects/zig-platform/host.zig b/...ng_examples/expects/zig-platform/host.zig → ...s/cli/tests/expects/zig-platform/host.zig
diff --git a/...ng_examples/expects/zig-platform/main.roc → ...s/cli/tests/expects/zig-platform/main.roc b/...ng_examples/expects/zig-platform/main.roc → ...s/cli/tests/expects/zig-platform/main.roc
diff --git a/crates/cli_utils/src/bench_utils.rs b/crates/cli_utils/src/bench_utils.rs
diff --git a/crates/cli_utils/src/helpers.rs b/crates/cli_utils/src/helpers.rs
@@ -404,14 +404,15 @@ pub fn extract_valgrind_errors(xml: &str) -> Result<Vec<ValgrindError>, serde_xm
     Ok(answer)
 }
 
-// start the dir with crates/cli_testing_examples
+// start the dir with crates/cli/tests
 #[allow(dead_code)]
 pub fn cli_testing_dir(dir_name: &str) -> PathBuf {
     let mut path = root_dir();
 
     // Descend into examples/{dir_name}
     path.push("crates");
-    path.push("cli_testing_examples");
+    path.push("cli");
+    path.push("tests");
     path.extend(dir_name.split('/')); // Make slashes cross-target
 
     path

diff --git a/crates/compiler/build/src/link.rs b/crates/compiler/build/src/link.rs
@@ -300,7 +300,7 @@ pub fn build_zig_host_wasm32(
             "c",
             "-target",
             "wasm32-wasi",
-            // "-femit-llvm-ir=/home/folkertdev/roc/roc/crates/cli_testing_examples/benchmarks/platform/host.ll",
+            // "-femit-llvm-ir=/home/folkertdev/roc/roc/crates/cli/tests/benchmarks/platform/host.ll",
             "-fPIC",
             "-fstrip",
         ]);
@@ -1241,7 +1241,7 @@ fn link_wasm32(
             "ReleaseSmall",
             "-rdynamic",
             // useful for debugging
-            // "-femit-llvm-ir=/home/folkertdev/roc/roc/crates/cli_testing_examples/benchmarks/platform/host.ll",
+            // "-femit-llvm-ir=/home/folkertdev/roc/roc/crates/cli/tests/benchmarks/platform/host.ll",
         ])
         .spawn()?;
 

diff --git a/getting_started/README.md b/getting_started/README.md
@@ -26,7 +26,7 @@ cd examples
 roc dev helloWorld.roc
 ```
 
-[crates/cli_testing_examples/benchmarks](https://github.com/roc-lang/roc/tree/main/crates/cli_testing_examples/benchmarks) contains more examples.
+[crates/cli/tests/benchmarks](https://github.com/roc-lang/roc/tree/main/crates/cli/tests/benchmarks) contains more examples.
 
 
 ## Getting Involved