fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-01 23:41:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1384 from wasmerio/test-fixes

Browse Source 
Various fixes for the latest testing changes
This commit is contained in:
Syrus Akbary 2020-04-16 17:27:46 -07:00 committed by GitHub
commit d57a526de7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile
View File

@ -18,29 +18,36 @@ RUST_VERSION := $(shell rustc -V)
ifneq (, $(findstring nightly,$(RUST_VERSION))) ifneq (, $(findstring nightly,$(RUST_VERSION)))
# Singlepass doesn't work yet on Windows # Singlepass doesn't work yet on Windows
ifneq ($(OS), Windows_NT) ifneq ($(OS), Windows_NT)
backends += singlepass backends += singlepass
endif endif
endif endif
ifeq ($(ARCH), x86_64) ifeq ($(ARCH), x86_64)
# In X64, Cranelift is enabled # In X64, Cranelift is enabled
backends += cranelift backends += cranelift
# LLVM is enabled if not in Windows # LLVM could be enabled if not in Windows
ifneq ($(OS), Windows_NT) ifneq ($(OS), Windows_NT)
LLVM_VERSION := $(shell llvm-config --version) # Autodetect LLVM from llvm-config
# If findstring is not empty, then it have found the value ifeq (, $(shell which llvm-config))
ifneq (, $(findstring 8,$(LLVM_VERSION))$(findstring 9,$(LLVM_VERSION))) LLVM_VERSION := $(shell llvm-config --version)
backends += llvm # If findstring is not empty, then it have found the value
endif ifneq (, $(findstring 8,$(LLVM_VERSION))$(findstring 9,$(LLVM_VERSION)))
backends += llvm
endif
else
ifeq (, $(shell which llvm-config-8))
backends += llvm
endif
endif
endif endif
endif endif
backends := $(filter-out ,$(backends)) backends := $(filter-out ,$(backends))
ifneq ($(OS), Windows_NT) ifneq ($(OS), Windows_NT)
bold := $(shell tput bold) bold := $(shell tput bold)
green := $(shell tput setaf 2) green := $(shell tput setaf 2)
reset := $(shell tput sgr0) reset := $(shell tput sgr0)
endif endif
@ -86,7 +93,7 @@ generate: generate-emtests generate-wasitests
# Spectests # Spectests
spectests-singlepass: spectests-singlepass:
cargo test singlepass::spec --release $(backend_features) cargo test singlepass::spec --release $(backend_features) -- --test-threads=1
spectests-cranelift: spectests-cranelift:
cargo test cranelift::spec --release $(backend_features) cargo test cranelift::spec --release $(backend_features)
@ -100,7 +107,7 @@ spectests:
# Emscripten tests # Emscripten tests
emtests-singlepass: emtests-singlepass:
cargo test singlepass::emscripten --release $(backend_features) cargo test singlepass::emscripten --release $(backend_features) -- --test-threads=1
emtests-cranelift: emtests-cranelift:
cargo test cranelift::emscripten --release $(backend_features) cargo test cranelift::emscripten --release $(backend_features)
@ -155,7 +162,7 @@ wasitests: wasitests-unit wasitests-singlepass wasitests-cranelift wasitests-llv
# Backends # Backends
singlepass: wasitests-setup singlepass: wasitests-setup
cargo test -p wasmer-singlepass-backend --release cargo test -p wasmer-singlepass-backend --release
cargo test singlepass:: --release $(backend_features) cargo test singlepass:: --release $(backend_features) -- --test-threads=1
cranelift: wasitests-setup cranelift: wasitests-setup
cargo test -p wasmer-clif-backend --release cargo test -p wasmer-clif-backend --release