From dd93453943c346a1c7dbb3ac9bbe1bd6fe99af27 Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Wed, 2 Aug 2023 14:32:31 +0200 Subject: [PATCH] rename tests to ui-tests --- package.json | 2 +- {tests => ui-tests}/.gitignore | 0 {tests => ui-tests}/Cargo.lock | 14 +++++++------- {tests => ui-tests}/Cargo.toml | 2 +- {tests => ui-tests}/src/bin/nilc-wrapper.rs | 0 {tests => ui-tests}/src/main.rs | 6 +++--- {tests => ui-tests}/ui/function_calls_ok.nil | 0 {tests => ui-tests}/ui/hello_world.nil | 0 {tests => ui-tests}/ui/type_assignments.nil | 0 9 files changed, 12 insertions(+), 12 deletions(-) rename {tests => ui-tests}/.gitignore (100%) rename {tests => ui-tests}/Cargo.lock (99%) rename {tests => ui-tests}/Cargo.toml (90%) rename {tests => ui-tests}/src/bin/nilc-wrapper.rs (100%) rename {tests => ui-tests}/src/main.rs (88%) rename {tests => ui-tests}/ui/function_calls_ok.nil (100%) rename {tests => ui-tests}/ui/hello_world.nil (100%) rename {tests => ui-tests}/ui/type_assignments.nil (100%) diff --git a/package.json b/package.json index eed5a4b..c48e517 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "tsc", "fmt": "prettier -w .", "test": "jest", - "ui-test": "npm run build && cargo run --manifest-path tests/Cargo.toml --bin tests", + "ui-test": "npm run build && cargo run --manifest-path ui-tests/Cargo.toml --bin ui-tests", "lint": "eslint ." }, "author": "", diff --git a/tests/.gitignore b/ui-tests/.gitignore similarity index 100% rename from tests/.gitignore rename to ui-tests/.gitignore diff --git a/tests/Cargo.lock b/ui-tests/Cargo.lock similarity index 99% rename from tests/Cargo.lock rename to ui-tests/Cargo.lock index b81b34d..a74f23b 100644 --- a/tests/Cargo.lock +++ b/ui-tests/Cargo.lock @@ -906,13 +906,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "tests" -version = "0.1.0" -dependencies = [ - "ui_test", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -994,6 +987,13 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "ui-tests" +version = "0.1.0" +dependencies = [ + "ui_test", +] + [[package]] name = "ui_test" version = "0.12.1" diff --git a/tests/Cargo.toml b/ui-tests/Cargo.toml similarity index 90% rename from tests/Cargo.toml rename to ui-tests/Cargo.toml index 996c032..1ab5878 100644 --- a/tests/Cargo.toml +++ b/ui-tests/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tests" +name = "ui-tests" version = "0.1.0" edition = "2021" diff --git a/tests/src/bin/nilc-wrapper.rs b/ui-tests/src/bin/nilc-wrapper.rs similarity index 100% rename from tests/src/bin/nilc-wrapper.rs rename to ui-tests/src/bin/nilc-wrapper.rs diff --git a/tests/src/main.rs b/ui-tests/src/main.rs similarity index 88% rename from tests/src/main.rs rename to ui-tests/src/main.rs index 46042cb..a4da45a 100644 --- a/tests/src/main.rs +++ b/ui-tests/src/main.rs @@ -8,7 +8,7 @@ fn main() { .args(&[ "build", "--manifest-path", - "tests/Cargo.toml", + "ui-tests/Cargo.toml", "--bin", "nilc-wrapper", ]) @@ -20,9 +20,9 @@ fn main() { .then_some(()) .unwrap_or_else(|| std::process::exit(1)); - let mut config = Config::rustc("tests/ui"); + let mut config = Config::rustc("ui-tests/ui"); config.host = Some("wasm :3".into()); - config.program = CommandBuilder::cmd("tests/target/debug/nilc-wrapper"); + config.program = CommandBuilder::cmd("ui-tests/target/debug/nilc-wrapper"); config.mode = Mode::Fail { require_patterns: false, }; diff --git a/tests/ui/function_calls_ok.nil b/ui-tests/ui/function_calls_ok.nil similarity index 100% rename from tests/ui/function_calls_ok.nil rename to ui-tests/ui/function_calls_ok.nil diff --git a/tests/ui/hello_world.nil b/ui-tests/ui/hello_world.nil similarity index 100% rename from tests/ui/hello_world.nil rename to ui-tests/ui/hello_world.nil diff --git a/tests/ui/type_assignments.nil b/ui-tests/ui/type_assignments.nil similarity index 100% rename from tests/ui/type_assignments.nil rename to ui-tests/ui/type_assignments.nil