File tree 8 files changed +27
-11
lines changed
8 files changed +27
-11
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ install:
20
20
build : false
21
21
22
22
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
24
24
- if NOT "%TARGET%" == "wasm32-unknown-unknown" cargo test --target %TARGET% && cargo test --release --target %TARGET%
25
25
26
26
branches :
Original file line number Diff line number Diff line change 1
1
target
2
2
Cargo.lock
3
3
* .o
4
- /bin
5
- /wasm-pack.log
Original file line number Diff line number Diff line change 9
9
- rustup target add $TARGET
10
10
- curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
11
11
script :
12
- - wasm-pack test --chrome --headless --release
12
+ - wasm-pack test --chrome --headless --release wasm-tests
13
13
addons :
14
14
chrome : stable
15
15
- env : TARGET=i686-unknown-linux-gnu
Original file line number Diff line number Diff line change @@ -18,9 +18,6 @@ name = "stacker"
18
18
doctest = false
19
19
test = false
20
20
21
- # TODO: Is that ok?
22
- crate-type = [" cdylib" , " rlib" ]
23
-
24
21
[dependencies ]
25
22
cfg-if = " 0.1.6"
26
23
libc = " 0.2.45"
@@ -35,8 +32,5 @@ features = [
35
32
' minwindef' ,
36
33
]
37
34
38
- [dev-dependencies ]
39
- wasm-bindgen-test = " 0.2"
40
-
41
35
[build-dependencies ]
42
36
cc = " 1.0"
Original file line number Diff line number Diff line change 1
1
extern crate cc;
2
2
3
3
use std:: env;
4
+ use std:: path:: PathBuf ;
4
5
5
6
fn main ( ) {
6
7
let target = env:: var ( "TARGET" ) . unwrap ( ) ;
7
8
8
9
if target. starts_with ( "wasm32" ) {
9
10
// wasm32 auxilary functions are provided as a precompiled object file.
10
11
// 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( ) ) ;
12
19
println ! ( "cargo:rustc-link-lib=stacker" ) ;
13
20
return ;
14
21
}
Original file line number Diff line number Diff line change
1
+ bin
2
+ wasm-pack.log
Original file line number Diff line number Diff line change
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"
Original file line number Diff line number Diff line change 1
1
#![ cfg( all( target_arch = "wasm32" , target_os = "unknown" ) ) ]
2
+ #![ cfg( test) ]
2
3
3
4
extern crate stacker;
4
5
extern crate wasm_bindgen_test;
You can’t perform that action at this time.
0 commit comments