Skip to content

Commit 6d730b1

Browse files
committed
Extract wasm-tests project.
1 parent 3d95671 commit 6d730b1

File tree

8 files changed

+27
-11
lines changed

8 files changed

+27
-11
lines changed

.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ install:
2020
build: false
2121

2222
test_script:
23-
- if "%TARGET%" == "wasm32-unknown-unknown" wasm-pack test --chrome --headless --release
23+
- if "%TARGET%" == "wasm32-unknown-unknown" wasm-pack test --chrome --headless --release wasm-tests
2424
- if NOT "%TARGET%" == "wasm32-unknown-unknown" cargo test --target %TARGET% && cargo test --release --target %TARGET%
2525

2626
branches:

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
target
22
Cargo.lock
33
*.o
4-
/bin
5-
/wasm-pack.log

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix:
99
- rustup target add $TARGET
1010
- curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
1111
script:
12-
- wasm-pack test --chrome --headless --release
12+
- wasm-pack test --chrome --headless --release wasm-tests
1313
addons:
1414
chrome: stable
1515
- env: TARGET=i686-unknown-linux-gnu

Cargo.toml

-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ name = "stacker"
1818
doctest = false
1919
test = false
2020

21-
# TODO: Is that ok?
22-
crate-type = ["cdylib", "rlib"]
23-
2421
[dependencies]
2522
cfg-if = "0.1.6"
2623
libc = "0.2.45"
@@ -35,8 +32,5 @@ features = [
3532
'minwindef',
3633
]
3734

38-
[dev-dependencies]
39-
wasm-bindgen-test = "0.2"
40-
4135
[build-dependencies]
4236
cc = "1.0"

build.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
extern crate cc;
22

33
use std::env;
4+
use std::path::PathBuf;
45

56
fn main() {
67
let target = env::var("TARGET").unwrap();
78

89
if target.starts_with("wasm32") {
910
// wasm32 auxilary functions are provided as a precompiled object file.
1011
// this is because LLVM with wasm32 support isn't widespread.
11-
println!("cargo:rustc-link-search={}", "src/arch/wasm32");
12+
let mut link_dir = PathBuf::new();
13+
link_dir.push(env!("CARGO_MANIFEST_DIR"));
14+
link_dir.push("src");
15+
link_dir.push("arch");
16+
link_dir.push("wasm32");
17+
18+
println!("cargo:rustc-link-search={}", link_dir.display());
1219
println!("cargo:rustc-link-lib=stacker");
1320
return;
1421
}

wasm-tests/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
bin
2+
wasm-pack.log

wasm-tests/Cargo.toml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[package]
2+
name = "wasm-tests"
3+
version = "0.1.0"
4+
authors = ["Sergey Shulepov <[email protected]>"]
5+
edition = "2018"
6+
7+
[lib]
8+
crate-type = ["cdylib", "rlib"]
9+
10+
[dependencies]
11+
stacker = { path = ".." }
12+
13+
[dev-dependencies]
14+
wasm-bindgen-test = "0.2"

tests/web.rs renamed to wasm-tests/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![cfg(all(target_arch = "wasm32", target_os = "unknown"))]
2+
#![cfg(test)]
23

34
extern crate stacker;
45
extern crate wasm_bindgen_test;

0 commit comments

Comments
 (0)