Refactor

Signed-off-by: Benjamin Schultzer <benjamin@schultzer.com>

Author: Schultzer

Cargo.toml

@@ -22,11 +22,8 @@ checked = []
 [workspace]
 members = [
   "crates/compiler-builtins-smoke-test",
-  "crates/libm-test",
-  "crates/test-framework"
+  "crates/libm-test"
 ]
 
 [dev-dependencies]
 no-panic = "0.1.8"
-libm-test = { version = "0.*", path = "./crates/libm-test" }
-rand = "0.6.5"

ci/run.sh

@@ -4,7 +4,7 @@ set -ex
 TARGET=$1
 
 cargo test --target $TARGET
-cargo test --features 'checked libm-test/conformance' --target $TARGET
-
 cargo test --target $TARGET --release
-cargo test --features 'checked libm-test/conformance' --target $TARGET --release
+
+cargo test -p libm-test --target $TARGET
+cargo test -p libm-test --target $TARGET --release

crates/libm-test/Cargo.toml

@@ -3,15 +3,7 @@ name = "libm-test"
 version = "0.1.0"
 authors = ["Benjamin Schultzer <benjamin@schultzer.com>"]
 
-[lib]
-proc-macro = true
-test = false
-
 [dependencies]
-test-framework = { version = "0.*", path = "./../test-framework" }
-proc-macro2 = { version = "0.4", features = ["nightly"] }
-quote = "0.6"
-syn = { version = "0.15", features = ["full"] }
-
-[features]
-conformance = []
+libm = { version = "0.*", path = "../../" }
+paste = "0.1.5"
+rand = "0.6.5"

crates/libm-test/build.rs

@@ -0,0 +1,13 @@
+use std::env;
+
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+    let opt_level = env::var("OPT_LEVEL")
+        .ok()
+        .and_then(|s| s.parse().ok())
+        .unwrap_or(0);
+    let profile = env::var("PROFILE").unwrap_or(String::new());
+    if profile == "release" || opt_level >= 2 {
+        println!("cargo:rustc-cfg=optimized");
+    }
+}