From 82d34c1678a3bea39078c0f6e5a151b15ffd5835 Mon Sep 17 00:00:00 2001
From: Adam Reichold <adam.reichold@t-online.de>
Date: Wed, 24 May 2023 09:08:44 +0200
Subject: [PATCH] fix(ci): Integrate numeric tests into workspace to avoid
 confusing cross.

---
 Cargo.toml               | 7 +++++--
 scripts/all-tests.sh     | 8 ++------
 scripts/cross-tests.sh   | 2 +-
 xtest-numeric/Cargo.toml | 5 -----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1c16e5bf1..a648b09bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,10 +75,13 @@ matrixmultiply-threading = ["matrixmultiply/threading"]
 
 [profile.bench]
 debug = true
+[profile.dev.package.numeric-tests]
+opt-level = 2
+[profile.test.package.numeric-tests]
+opt-level = 2
 
 [workspace]
-members = ["ndarray-rand", "xtest-serialization", "xtest-blas"]
-exclude = ["xtest-numeric"]
+members = ["ndarray-rand", "xtest-serialization", "xtest-blas", "xtest-numeric"]
 
 [package.metadata.release]
 no-dev-version = true
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
index 1e3564962..3362f876c 100755
--- a/scripts/all-tests.sh
+++ b/scripts/all-tests.sh
@@ -14,10 +14,6 @@ if [ "$CHANNEL" -eq "1.51.0" ]; then
     cargo update --package once_cell --precise 1.14.0
     cargo update --package openblas-src --precise 0.10.5
     cargo update --package openblas-build --precise 0.10.5
-
-    cargo update --manifest-path=xtest-numeric/Cargo.toml --package thiserror --precise 1.0.39
-    cargo update --manifest-path=xtest-numeric/Cargo.toml --package openblas-src --precise 0.10.5
-    cargo update --manifest-path=xtest-numeric/Cargo.toml --package openblas-build --precise 0.10.5
 fi
 
 cargo build --verbose --no-default-features
@@ -31,6 +27,6 @@ cargo test --manifest-path=ndarray-rand/Cargo.toml --features quickcheck --verbo
 cargo test --manifest-path=xtest-serialization/Cargo.toml --verbose
 cargo test --manifest-path=xtest-blas/Cargo.toml --verbose --features openblas-system
 cargo test --examples
-CARGO_TARGET_DIR=target/ cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose
-CARGO_TARGET_DIR=target/ cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose --features test_blas
+cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose
+cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose --features test_blas
 ([ "$CHANNEL" -ne "nightly" ] || cargo bench --no-run --verbose --features "$FEATURES")
diff --git a/scripts/cross-tests.sh b/scripts/cross-tests.sh
index 7c4f13111..7473a72fa 100755
--- a/scripts/cross-tests.sh
+++ b/scripts/cross-tests.sh
@@ -11,4 +11,4 @@ cross build -v --features="$FEATURES" --target=$TARGET
 cross test -v --no-fail-fast --features="$FEATURES" --target=$TARGET
 cross test -v --no-fail-fast --target=$TARGET --manifest-path=ndarray-rand/Cargo.toml --features quickcheck
 cross test -v --no-fail-fast --target=$TARGET --manifest-path=xtest-serialization/Cargo.toml --verbose
-CARGO_TARGET_DIR=target/ cross test -v --no-fail-fast --target=$TARGET --manifest-path=xtest-numeric/Cargo.toml
+cross test -v --no-fail-fast --target=$TARGET --manifest-path=xtest-numeric/Cargo.toml
diff --git a/xtest-numeric/Cargo.toml b/xtest-numeric/Cargo.toml
index bdfe15044..8558d39ad 100644
--- a/xtest-numeric/Cargo.toml
+++ b/xtest-numeric/Cargo.toml
@@ -27,8 +27,3 @@ test = false
 
 [features]
 test_blas = ["ndarray/blas", "blas-src", "openblas-src"]
-
-[profile.dev]
-opt-level = 2
-[profile.test]
-opt-level = 2