Skip to content

Commit 9b9f9a4

Browse files
committed
Copy appveyor setup from rayon
1 parent 60e11d8 commit 9b9f9a4

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
lines changed

appveyor.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ build: false
5252
test_script:
5353
- cargo build --verbose --target %TARGET%
5454
- cargo test --target %TARGET%
55-
- if "%CHANNEL%" == "nightly" cargo clean
56-
- if "%CHANNEL%" == "nightly" cargo build --verbose --target %TARGET% --features "compiletest"
57-
- if "%CHANNEL%" == "nightly" cargo test --target %TARGET% --features "compiletest"
55+
- if [%CHANNEL%]==[nightly] (
56+
cargo clean &&
57+
cargo build --verbose --target %TARGET% --features "compiletest" &&
58+
cargo test --target %TARGET% --features "compiletest"
59+
)

tests/compile_tests.rs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,7 @@ fn run_mode(mode: &'static str) {
77
let mut config = compiletest::Config::default();
88
config.mode = mode.parse().expect("Invalid mode");
99
config.src_base = ["tests", mode].iter().collect();
10-
// Create linker paths
11-
let debug_path: PathBuf = ["target", "debug"].iter().collect();
12-
let mut deps_path: PathBuf = debug_path.clone();
13-
deps_path.push("deps");
14-
15-
// Convert linker paths to string representation
16-
let mut target_rustcflags = "".to_string();
17-
for x in [debug_path, deps_path].iter() {
18-
if let Some(s) = x.to_str() {
19-
target_rustcflags.push_str(&format!("-L {} ", s))
20-
}
21-
}
22-
23-
// Save linker flags
24-
config.target_rustcflags = if target_rustcflags.len() > 0 {
25-
Some(target_rustcflags)
26-
} else {
27-
None
28-
};
10+
config.target_rustcflags = Some("-L target/debug/ -L target/debug/deps/".to_owned());
2911

3012
config.verbose = true;
3113

0 commit comments

Comments
 (0)