Merge pull request #1880 from wasmerio/cmake-delete

Remove cmake dependency

.github/workflows/main.yaml

@@ -218,8 +218,8 @@ jobs:
         run: |
           ls target/release
           alias wasmer=target/release/wasmer
-          ./target/release/wasmer compile --target=x86_64-apple-darwin tests/integration/cli/assets/qjs.wasm -o qjs_mac_from_linux.wjit
-          #./target/release/wasmer compile --target=x86_64-pc-windows-msvc tests/integration/cli/assets/qjs.wasm -o qjs_win_from_linux.wjit
+          ./target/release/wasmer compile --target=x86_64-apple-darwin lib/c-api/tests/assets/qjs.wasm -o qjs_mac_from_linux.wjit
+          #./target/release/wasmer compile --target=x86_64-pc-windows-msvc lib/c-api/tests/assets/qjs.wasm -o qjs_win_from_linux.wjit
           mkdir cross
           cp qjs_mac_from_linux.wjit cross
           #cp qjs_win_from_linux.wjit cross
@@ -230,8 +230,8 @@ jobs:
         run: |
           ls target/release
           alias wasmer=target/release/wasmer
-          ./target/release/wasmer compile --target=x86_64-unknown-linux-gnu tests/integration/cli/assets/qjs.wasm -o qjs_linux_from_mac.wjit
-          #./target/release/wasmer compile --target=x86_64-pc-windows-msvc tests/integration/cli/assets/qjs.wasm -o qjs_win_from_mac.wjit
+          ./target/release/wasmer compile --target=x86_64-unknown-linux-gnu lib/c-api/tests/assets/qjs.wasm -o qjs_linux_from_mac.wjit
+          #./target/release/wasmer compile --target=x86_64-pc-windows-msvc lib/c-api/tests/assets/qjs.wasm -o qjs_win_from_mac.wjit
           mkdir cross
           cp qjs_linux_from_mac.wjit cross
           #cp qjs_win_from_mac.wjit cross

.gitignore

@@ -13,8 +13,3 @@ api-docs-repo/
 # Generated by tests on Android
 /avd
 /core
-/lib/c-api/examples/exports-function
-/lib/c-api/examples/exports-global
-/lib/c-api/examples/imports-exports
-/lib/c-api/examples/instance
-/lib/c-api/examples/memory

CHANGELOG.md

@@ -14,6 +14,7 @@
 ### Changed
 
 - [#1874](https://github.com/wasmerio/wasmer/pull/1874) Set `CompilerConfig` to be owned (following wasm-c-api)
+- [#1880](https://github.com/wasmerio/wasmer/pull/1880) Remove cmake dependency for tests
 
 ## 1.0.0-beta1 - 2020-12-01
 

Makefile

@@ -52,7 +52,7 @@ ifneq (,$(filter $(ARCH),aarch64 arm64))
 	ifneq (, $(findstring llvm,$(compilers)))
 		test_compilers_engines += llvm-native
 	endif
-	# if we are in Darwin, we use the system libffi for the capi
+	# if we are in macos arm64, we use the system libffi for the capi
 	ifeq ($(UNAME_S), Darwin)
 		capi_default_features := --features system-libffi
 	endif
@@ -224,19 +224,17 @@ test-packages:
 
 # The test-capi rules depend on the build-capi rules to build the .a files to
 # link the tests against. cargo test doesn't know that the tests will be running
-# cmake + make to build programs whose dependencies cargo isn't aware of.
-
 test-capi: $(foreach compiler_engine,$(test_compilers_engines),test-capi-$(compiler_engine))
 
-test-capi-singlepass-jit: build-capi-singlepass-jit test-capi-examples
+test-capi-singlepass-jit: build-capi-singlepass-jit test-capi-tests
 	cargo test --manifest-path lib/c-api/Cargo.toml --release \
 		--no-default-features --features deprecated,wat,jit,singlepass,wasi $(capi_default_features) -- --nocapture
 
-test-capi-cranelift-jit: build-capi-cranelift-jit test-capi-examples
+test-capi-cranelift-jit: build-capi-cranelift-jit test-capi-tests
 	cargo test --manifest-path lib/c-api/Cargo.toml --release \
 		--no-default-features --features deprecated,wat,jit,cranelift,wasi $(capi_default_features) -- --nocapture
 
-test-capi-cranelift-native: build-capi-cranelift-native test-capi-examples
+test-capi-cranelift-native: build-capi-cranelift-native test-capi-tests
 	cargo test --manifest-path lib/c-api/Cargo.toml --release \
 		--no-default-features --features deprecated,wat,native,cranelift,wasi $(capi_default_features) -- --nocapture
 
@@ -248,7 +246,10 @@ test-capi-llvm-native:
 	cargo test --manifest-path lib/c-api/Cargo.toml --release \
 		--no-default-features --features deprecated,wat,native,llvm,wasi $(capi_default_features) -- --nocapture
 
-test-capi-examples: package-capi
+test-capi-tests: package-capi
+	# Test the Wasmer C API tests for C
+	cd lib/c-api/tests; WASMER_DIR=`pwd`/../../../package make test
+	# Test the Wasmer C API examples
 	cd lib/c-api/examples; WASMER_DIR=`pwd`/../../../package make run
 
 test-wasi-unit:
@@ -287,8 +288,6 @@ else
 	cp target/release/wasmer package/bin/
 endif
 
-
-
 package-capi:
 	mkdir -p "package/include"
 	mkdir -p "package/lib"
@@ -301,6 +300,8 @@ ifeq ($(OS), Windows_NT)
 	cp target/release/wasmer_c_api.lib package/lib
 else
 ifeq ($(UNAME_S), Darwin)
+	# For some reason in macOS arm64 there are issues if we copy constantly in the install_name_tool util
+	rm -f package/lib/libwasmer.dylib
 	cp target/release/libwasmer_c_api.dylib package/lib/libwasmer.dylib
 	cp target/release/libwasmer_c_api.a package/lib/libwasmer.a
 	# Fix the rpath for the dylib

lib/c-api/examples/.gitignore

@@ -1 +1,9 @@
+
+*
 *.o
+
+
+# Unignore files ending with `.c` (i.e. `wasm-c-api-wasi.c`)
+!*.c
+# Unignore Makefile
+!Makefile

lib/c-api/examples/Makefile

@@ -1,4 +1,3 @@
-
 $(info Using provided WASMER_DIR=$(WASMER_DIR))
 
 ifeq (,$(wildcard $(WASMER_DIR)/bin/wasmer))

lib/c-api/tests/.gitignore

@@ -0,0 +1,6 @@
+# ignore wasm-c-api binaries
+wasm-c-api-*
+test-*
+
+# Unignore files ending with `.c` (i.e. `wasm-c-api-wasi.c`)
+!*.c

lib/c-api/tests/Makefile

@@ -0,0 +1,75 @@
+$(info Using provided WASMER_DIR=$(WASMER_DIR))
+
+ifeq (,$(wildcard $(WASMER_DIR)/bin/wasmer))
+	CFLAGS = -g -I$(WASMER_DIR)/include
+	LDFLAGS = -Wl,-rpath,$(WASMER_DIR)/lib
+	LDLIBS = -L$(WASMER_DIR)/lib -lwasmer
+else
+	CFLAGS = -g -I$(shell $(WASMER_DIR)/bin/wasmer config --includedir)
+	LDFLAGS = -Wl,-rpath,$(shell $(WASMER_DIR)/bin/wasmer config --libdir)
+	LDLIBS = $(shell $(WASMER_DIR)/bin/wasmer config --libs)
+endif
+
+$(info * CFLAGS: $(CFLAGS))
+$(info * LDFLAGS: $(LDFLAGS))
+$(info * LDLIBS: $(LDLIBS))
+
+CAPI_WASMER_TESTS = \
+	test-early-exit 					test-memory 							  	test-wasi \
+	test-wat2wasm
+
+CAPI_BASE_TESTS = \
+	wasm-c-api/example/callback			wasm-c-api/example/global				  	wasm-c-api/example/hello \
+	wasm-c-api/example/memory			wasm-c-api/example/reflect				  	wasm-c-api/example/serialize \
+	wasm-c-api/example/start			wasm-c-api/example/trap
+
+CAPI_BASE_TESTS_NOT_WORKING = \
+	wasm-c-api/example/finalize			wasm-c-api/example/hostref				  	wasm-c-api/example/multi \
+	wasm-c-api/example/table			wasm-c-api/example/threads
+
+DEPRECATED_TESTS = \
+	deprecated/test-context				deprecated/test-import-object				deprecated/test-module-imports \
+	deprecated/test-import-trap			deprecated/test-module-serialize \
+	deprecated/test-exported-memory		deprecated/test-imports						deprecated/test-module \
+	deprecated/test-exports				deprecated/test-instantiate					deprecated/test-tables \
+	deprecated/test-globals				deprecated/test-memory						deprecated/test-validate \
+	deprecated/test-module-exports		deprecated/test-module-import-instantiate
+
+DEPRECATED_NOT_WORKING = test-import-function test-import-function-callinfo test-wasi-import-object test-emscripten-import-object
+
+ALL = $(CAPI_BASE_TESTS) $(CAPI_WASMER_TESTS) $(DEPRECATED_TESTS)
+
+test-%: %.o
+deprecated/test-%: deprecated/%.o
+
+.PHONY: all
+all: $(ALL)
+
+.PHONY: test-capi-wasmer
+.SILENT: test-capi-wasmer
+test-capi-wasmer: $(CAPI_WASMER_TESTS)
+	set -o errexit; \
+	$(foreach example,$?,echo Running \"$(example)\" example; cd $(shell dirname $(realpath $(example))) && ./$(shell basename $(example)); echo;)
+
+.PHONY: test-capi-base
+.SILENT: test-capi-base
+test-capi-base: $(CAPI_BASE_TESTS)
+	set -o errexit; \
+	$(foreach example,$?,echo Running \"$(example)\" example; cd $(shell dirname $(realpath $(example))) && ./$(shell basename $(example)); echo;)
+
+.PHONY: test-capi-base
+.SILENT: test-capi-base
+test-capi: test-capi-base test-capi-wasmer
+
+.PHONY: test-deprecated
+.SILENT: test-deprecated
+test-deprecated: $(DEPRECATED_TESTS)
+	set -o errexit; \
+	$(foreach example,$?,echo Running \"$(example)\" example; cd $(shell dirname $(realpath $(example))) && ./$(shell basename $(example)); echo;)
+
+test: test-capi test-deprecated
+
+.SILENT: clean
+.PHONY: clean
+clean:
+	$(foreach file,$(ALL),rm -f $(file).o $(file))

lib/c-api/tests/deprecated/.gitignore

@@ -1,35 +1,3 @@
-CMakeLists.txt.user
-CMakeCache.txt
-CMakeFiles
-CMakeScripts
-Testing
-Makefile
-cmake_install.cmake
-install_manifest.txt
-compile_commands.json
-CTestTestfile.cmake
-_deps
-rust-build
-test-context
-test-exported-memory
-test-exports
-test-globals
-test-import-function
-test-import-trap
-test-import-object
-test-imports
-test-instantiate
-test-memory
-test-module
-test-module-exports
-test-module-import-instantiate
-test-module-imports
-test-module-serialize
-test-tables
-test-validate
-test-wasi-import-object
-test-emscripten-import-object
-
 # ignore wasm-c-api binaries
 wasm-c-api-*
 test-*