Merge pull request #6558 from jschear/js/move_cli_testing_examples

Move cli_testing_examples under crates/cli/tests

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,

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

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()?;