diff --git a/.appveyor.yml b/.appveyor.yml index 5dbfd5662..b0a5e2904 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -49,10 +49,8 @@ install: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: + - git submodule update --init - cargo build --release --verbose - # Now we build wapm - - git submodule init - - git submodule update # Cache wapm cli target in dir above to prevent breaking git submodule on windows - if not exist wapm-cli-target mkdir wapm-cli-target - move wapm-cli-target wapm-cli diff --git a/.circleci/config.yml b/.circleci/config.yml index 3761f073e..e02dd9a55 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,6 +27,10 @@ jobs: <<: *run_with_build_env_vars steps: - checkout + - run: + name: "Pull Submodules" + command: | + git submodule update --init - restore_cache: keys: - v8-lint-{{ arch }}-{{ checksum "Cargo.lock" }} @@ -57,6 +61,10 @@ jobs: <<: *run_with_build_env_vars steps: - checkout + - run: + name: "Pull Submodules" + command: | + git submodule update --init - restore_cache: keys: - v8-test-cargo-cache-linux-stable-{{ arch }}-{{ checksum "Cargo.lock" }} @@ -87,6 +95,10 @@ jobs: <<: *run_with_build_env_vars steps: - checkout + - run: + name: "Pull Submodules" + command: | + git submodule update --init - restore_cache: keys: - v8-test-cargo-cache-linux-nightly-{{ arch }}-{{ checksum "Cargo.lock" }} @@ -118,6 +130,10 @@ jobs: xcode: "9.0" steps: - checkout + - run: + name: "Pull Submodules" + command: | + git submodule update --init - restore_cache: keys: - v8-cargo-cache-darwin-nightly-{{ arch }}-{{ checksum "Cargo.lock" }} @@ -172,6 +188,10 @@ jobs: - image: circleci/rust:latest steps: - checkout + - run: + name: "Pull Submodules" + command: | + git submodule update --init - run: name: "Pull dependencies" command: | diff --git a/.gitmodules b/.gitmodules index af96cdf0e..a928e9b14 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ [submodule "wapm-cli"] path = wapm-cli url = https://github.com/wasmerio/wapm-cli.git +[submodule "lib/clif-backend/cranelift"] + path = lib/clif-backend/cranelift + url = https://github.com/wasmerio/cranelift + branch = wasmer diff --git a/CHANGELOG.md b/CHANGELOG.md index 529bd97e5..1a2add63b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All PRs to the Wasmer repository must add to this file. Blocks of changes will separated by version increments. ## **[Unreleased]** +- [#541](https://github.com/wasmerio/wasmer/pull/541) Fix dependency graph by making separate test crates; ABI implementations should not depend on compilers. Add Cranelift fork as git submodule of clif-backend +- [#537](https://github.com/wasmerio/wasmer/pull/537) Add hidden flag (`--cache-key`) to use prehashed key into the compiled wasm cache and change compiler backend-specific caching to use directories +- [#536](https://github.com/wasmerio/wasmer/pull/536) ~Update cache to use compiler backend name in cache key~ + ## 0.5.4 - [#529](https://github.com/wasmerio/wasmer/pull/529) Updates the Wasm Interface library, which is used by wapm, with bug fixes and error message improvements diff --git a/Cargo.lock b/Cargo.lock index 087094ff4..4f702993b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -245,21 +245,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cranelift-bforest" version = "0.31.0" -source = "git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780#2ada531d79b34a9e6c94c81f2615677e22d68780" dependencies = [ - "cranelift-entity 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", + "cranelift-entity 0.31.0", ] [[package]] name = "cranelift-codegen" version = "0.31.0" -source = "git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780#2ada531d79b34a9e6c94c81f2615677e22d68780" dependencies = [ - "cranelift-bforest 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", - "cranelift-codegen-meta 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", - "cranelift-entity 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", + "cranelift-bforest 0.31.0", + "cranelift-codegen-meta 0.31.0", + "cranelift-entity 0.31.0", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -267,22 +266,20 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" version = "0.31.0" -source = "git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780#2ada531d79b34a9e6c94c81f2615677e22d68780" dependencies = [ - "cranelift-entity 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", + "cranelift-entity 0.31.0", ] [[package]] name = "cranelift-entity" version = "0.31.0" -source = "git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780#2ada531d79b34a9e6c94c81f2615677e22d68780" [[package]] name = "cranelift-frontend" version = "0.31.0" -source = "git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780#2ada531d79b34a9e6c94c81f2615677e22d68780" dependencies = [ - "cranelift-codegen 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", + "cranelift-codegen 0.31.0", + "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -290,9 +287,8 @@ dependencies = [ [[package]] name = "cranelift-native" version = "0.31.0" -source = "git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780#2ada531d79b34a9e6c94c81f2615677e22d68780" dependencies = [ - "cranelift-codegen 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", + "cranelift-codegen 0.31.0", "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -300,14 +296,16 @@ dependencies = [ [[package]] name = "cranelift-wasm" version = "0.31.0" -source = "git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780#2ada531d79b34a9e6c94c81f2615677e22d68780" dependencies = [ - "cranelift-codegen 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", - "cranelift-entity 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", - "cranelift-frontend 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", + "cranelift-codegen 0.31.0", + "cranelift-entity 0.31.0", + "cranelift-frontend 0.31.0", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser 0.32.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -550,6 +548,16 @@ dependencies = [ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "hashbrown" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "hashmap_core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "heck" version = "0.3.1" @@ -1425,6 +1433,7 @@ dependencies = [ "wasmer-clif-backend 0.5.4", "wasmer-dev-utils 0.5.4", "wasmer-emscripten 0.5.4", + "wasmer-emscripten-tests 0.5.4", "wasmer-kernel-loader 0.1.0", "wasmer-llvm-backend 0.5.4", "wasmer-middleware-common 0.5.4", @@ -1432,6 +1441,7 @@ dependencies = [ "wasmer-runtime-core 0.5.4", "wasmer-singlepass-backend 0.5.4", "wasmer-wasi 0.5.4", + "wasmer-wasi-tests 0.5.4", ] [[package]] @@ -1439,11 +1449,11 @@ name = "wasmer-clif-backend" version = "0.5.4" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cranelift-codegen 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", - "cranelift-entity 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", - "cranelift-frontend 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", - "cranelift-native 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", - "cranelift-wasm 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)", + "cranelift-codegen 0.31.0", + "cranelift-entity 0.31.0", + "cranelift-frontend 0.31.0", + "cranelift-native 0.31.0", + "cranelift-wasm 0.31.0", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1471,15 +1481,23 @@ name = "wasmer-emscripten" version = "0.5.4" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-runtime-core 0.5.4", +] + +[[package]] +name = "wasmer-emscripten-tests" +version = "0.5.4" +dependencies = [ + "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-backend 0.5.4", "wasmer-dev-utils 0.5.4", + "wasmer-emscripten 0.5.4", "wasmer-llvm-backend 0.5.4", "wasmer-runtime-core 0.5.4", "wasmer-singlepass-backend 0.5.4", @@ -1614,17 +1632,25 @@ version = "0.5.4" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "generational-arena 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-runtime-core 0.5.4", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmer-wasi-tests" +version = "0.5.4" +dependencies = [ + "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-backend 0.5.4", "wasmer-dev-utils 0.5.4", "wasmer-llvm-backend 0.5.4", "wasmer-runtime-core 0.5.4", "wasmer-singlepass-backend 0.5.4", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-wasi 0.5.4", ] [[package]] @@ -1643,6 +1669,9 @@ dependencies = [ name = "wasmparser" version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "which" @@ -1739,13 +1768,6 @@ dependencies = [ "checksum cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "2ca4386c8954b76a8415b63959337d940d724b336cabd3afe189c2b51a7e1ff0" "checksum colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cdb90b60f2927f8d76139c72dbde7e10c3a2bc47c8594c9c7a66529f2687c03" "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" -"checksum cranelift-bforest 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)" = "" -"checksum cranelift-codegen 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)" = "" -"checksum cranelift-codegen-meta 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)" = "" -"checksum cranelift-entity 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)" = "" -"checksum cranelift-frontend 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)" = "" -"checksum cranelift-native 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)" = "" -"checksum cranelift-wasm 0.31.0 (git+https://github.com/wasmerio/cranelift.git?rev=2ada531d79b34a9e6c94c81f2615677e22d68780)" = "" "checksum criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0363053954f3e679645fc443321ca128b7b950a6fe288cf5f9335cc22ee58394" "checksum criterion-plot 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76f9212ddf2f4a9eb2d401635190600656a1f88a932ef53d06e7fa4c7e02fb8e" "checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3" @@ -1771,6 +1793,8 @@ dependencies = [ "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum goblin 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "84473a5302fa5094d3d9911c2f312f522f9a37462a777f195f63fae1bf7faf4d" "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" +"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" +"checksum hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8e04cb7a5051270ef3fa79f8c7604d581ecfa73d520e74f554e45541c4b5881a" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" diff --git a/Cargo.toml b/Cargo.toml index aef63f767..921a3c456 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,6 +35,8 @@ wasmer-llvm-backend = { path = "lib/llvm-backend", optional = true } wasmer-wasi = { path = "lib/wasi", optional = true } wasmer-kernel-loader = { path = "lib/kernel-loader", optional = true } wasmer-dev-utils = { path = "lib/dev-utils", optional = true } +wasmer-wasi-tests = { path = "lib/wasi-tests", optional = true } +wasmer-emscripten-tests = { path = "lib/emscripten-tests", optional = true } [workspace] members = [ @@ -53,6 +55,8 @@ members = [ "lib/kernel-loader", "lib/kernel-net", "lib/dev-utils", + "lib/wasi-tests", + "lib/emscripten-tests", "examples/plugin-for-example" ] @@ -69,8 +73,8 @@ trace = ["wasmer-runtime-core/trace"] extra-debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"] # This feature will allow cargo test to run much faster fast-tests = [] -"backend:llvm" = ["wasmer-llvm-backend"] -"backend:singlepass" = ["wasmer-singlepass-backend"] +"backend:llvm" = ["wasmer-llvm-backend", "wasmer-runtime-core/backend:llvm"] +"backend:singlepass" = ["wasmer-singlepass-backend", "wasmer-runtime-core/backend:singlepass"] wasi = ["wasmer-wasi"] # vfs = ["wasmer-runtime-abi"] diff --git a/Makefile b/Makefile index f5aaff75b..a8a56ef40 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,10 @@ generate-spectests: WASMER_RUNTIME_GENERATE_SPECTESTS=1 cargo build -p wasmer-runtime-core --release generate-emtests: - WASM_EMSCRIPTEN_GENERATE_EMTESTS=1 cargo build -p wasmer-emscripten --release + WASM_EMSCRIPTEN_GENERATE_EMTESTS=1 cargo build -p wasmer-emscripten-tests --release generate-wasitests: - WASM_WASI_GENERATE_WASITESTS=1 cargo build -p wasmer-wasi --release + WASM_WASI_GENERATE_WASITESTS=1 cargo build -p wasmer-wasi-tests --release generate: generate-spectests generate-emtests generate-wasitests @@ -28,15 +28,18 @@ spectests: spectests-singlepass spectests-cranelift spectests-llvm # Emscripten tests emtests-singlepass: - cargo test --manifest-path lib/emscripten/Cargo.toml --release --features singlepass -- --test-threads=1 + cargo test --manifest-path lib/emscripten-tests/Cargo.toml --release --features singlepass -- --test-threads=1 emtests-cranelift: - cargo test --manifest-path lib/emscripten/Cargo.toml --release --features clif -- --test-threads=1 + cargo test --manifest-path lib/emscripten-tests/Cargo.toml --release --features clif -- --test-threads=1 emtests-llvm: - cargo test --manifest-path lib/emscripten/Cargo.toml --release --features llvm -- --test-threads=1 + cargo test --manifest-path lib/emscripten-tests/Cargo.toml --release --features llvm -- --test-threads=1 -emtests: emtests-singlepass emtests-cranelift emtests-llvm +emtests-unit: + cargo test --manifest-path lib/emscripten/Cargo.toml --release + +emtests: emtests-unit emtests-singlepass emtests-cranelift emtests-llvm # Middleware tests @@ -54,15 +57,18 @@ middleware: middleware-singlepass middleware-cranelift middleware-llvm # Wasitests wasitests-singlepass: - cargo test --manifest-path lib/wasi/Cargo.toml --release --features singlepass -- --test-threads=1 + cargo test --manifest-path lib/wasi-tests/Cargo.toml --release --features singlepass -- --test-threads=1 wasitests-cranelift: - cargo test --manifest-path lib/wasi/Cargo.toml --release --features clif -- --test-threads=1 + cargo test --manifest-path lib/wasi-tests/Cargo.toml --release --features clif -- --test-threads=1 wasitests-llvm: - cargo test --manifest-path lib/wasi/Cargo.toml --release --features llvm -- --test-threads=1 + cargo test --manifest-path lib/wasi-tests/Cargo.toml --release --features llvm -- --test-threads=1 -wasitests: wasitests-singlepass wasitests-cranelift wasitests-llvm +wasitests-unit: + cargo test --manifest-path lib/wasi/Cargo.toml --release + +wasitests: wasitests-unit wasitests-singlepass wasitests-cranelift wasitests-llvm # Backends @@ -83,7 +89,7 @@ capi: cargo test -p wasmer-runtime-c-api --release test-rest: capi - cargo test --release --all --exclude wasmer-runtime-c-api --exclude wasmer-emscripten --exclude wasmer-spectests --exclude wasmer-wasi --exclude wasmer-middleware-common --exclude wasmer-singlepass-backend --exclude wasmer-clif-backend --exclude wasmer-llvm-backend + cargo test --release --all --exclude wasmer-runtime-c-api --exclude wasmer-emscripten --exclude wasmer-spectests --exclude wasmer-wasi --exclude wasmer-middleware-common --exclude wasmer-singlepass-backend --exclude wasmer-clif-backend --exclude wasmer-llvm-backend --exclude wasmer-wasi-tests --exclude wasmer-emscripten-tests circleci-clean: @if [ ! -z "${CIRCLE_JOB}" ]; then rm -f /home/circleci/project/target/debug/deps/libcranelift_wasm* && rm -f /Users/distiller/project/target/debug/deps/libcranelift_wasm*; fi; @@ -118,8 +124,14 @@ release: release-fast: # If you are in OS-X, you will need mingw-w64 for cross compiling to windows # brew install mingw-w64 + cargo build --release + +release-singlepass: cargo build --release --features backend:singlepass +release-llvm: + cargo build --release --features backend:llvm + bench: cargo bench --all @@ -141,4 +153,4 @@ publish-release: # cargo install cargo-deps # must install graphviz for `dot` dep-graph: - cargo deps --optional-deps --filter wasmer-wasi wasmer-kernel-loader wasmer-dev-utils wasmer-llvm-backend wasmer-emscripten wasmer-runtime-core wasmer-runtime wasmer-middleware-common wasmer-singlepass-backend wasmer-clif-backend wasmer --manifest-path Cargo.toml | dot -Tpng > wasmer_depgraph.png + cargo deps --optional-deps --filter wasmer-wasi wasmer-wasi-tests wasmer-kernel-loader wasmer-dev-utils wasmer-llvm-backend wasmer-emscripten wasmer-emscripten-tests wasmer-runtime-core wasmer-runtime wasmer-middleware-common wasmer-singlepass-backend wasmer-clif-backend wasmer --manifest-path Cargo.toml | dot -Tpng > wasmer_depgraph.png diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml index dcfd081cd..b208933c6 100644 --- a/lib/clif-backend/Cargo.toml +++ b/lib/clif-backend/Cargo.toml @@ -9,11 +9,11 @@ edition = "2018" [dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.5.4" } -cranelift-native = { git = "https://github.com/wasmerio/cranelift.git", rev = "2ada531d79b34a9e6c94c81f2615677e22d68780" } -cranelift-codegen = { git = "https://github.com/wasmerio/cranelift.git", rev = "2ada531d79b34a9e6c94c81f2615677e22d68780" } -cranelift-entity = { git = "https://github.com/wasmerio/cranelift.git", rev = "2ada531d79b34a9e6c94c81f2615677e22d68780" } -cranelift-frontend = { git = "https://github.com/wasmerio/cranelift.git", rev = "2ada531d79b34a9e6c94c81f2615677e22d68780" } -cranelift-wasm = { git = "https://github.com/wasmerio/cranelift.git", rev = "2ada531d79b34a9e6c94c81f2615677e22d68780" } +cranelift-native = { path = "cranelift/cranelift-native", version = "0.31" } +cranelift-codegen = { path = "cranelift/cranelift-codegen", version = "0.31" } +cranelift-entity = { path = "cranelift/cranelift-entity", version = "0.31" } +cranelift-frontend = { path = "cranelift/cranelift-frontend", version = "0.31" } +cranelift-wasm = { path = "cranelift/cranelift-wasm", version = "0.31" } hashbrown = "0.1" target-lexicon = "0.4.0" wasmparser = "0.32.1" diff --git a/lib/clif-backend/cranelift b/lib/clif-backend/cranelift new file mode 160000 index 000000000..19b19f171 --- /dev/null +++ b/lib/clif-backend/cranelift @@ -0,0 +1 @@ +Subproject commit 19b19f171cf4511660c5f2097af41a9b49774825 diff --git a/lib/emscripten-tests/Cargo.toml b/lib/emscripten-tests/Cargo.toml new file mode 100644 index 000000000..fc8510b56 --- /dev/null +++ b/lib/emscripten-tests/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "wasmer-emscripten-tests" +version = "0.5.4" +description = "Tests for our Emscripten implementation" +license = "MIT" +authors = ["The Wasmer Engineering Team "] +edition = "2018" +publish = false +build = "build/mod.rs" + +[dependencies] +wasmer-emscripten = { path = "../emscripten", version = "0.5.4" } +wasmer-runtime-core = { path = "../runtime-core", version = "0.5.4" } +wasmer-clif-backend = { path = "../clif-backend", version = "0.5.4" } +wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.4", optional = true } +wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.4", optional = true } + +[dev-dependencies] +wabt = "0.7.2" +wasmer-dev-utils = { path = "../dev-utils", version = "0.5.4"} + +[build-dependencies] +glob = "0.2.11" + +[features] +clif = [] +llvm = ["wasmer-llvm-backend"] +singlepass = ["wasmer-singlepass-backend"] \ No newline at end of file diff --git a/lib/emscripten/emtests/test_exceptions_white_list_empty.out b/lib/emscripten-tests/a.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_white_list_empty.out rename to lib/emscripten-tests/a.txt diff --git a/lib/emscripten/build/emtests.rs b/lib/emscripten-tests/build/emtests.rs similarity index 100% rename from lib/emscripten/build/emtests.rs rename to lib/emscripten-tests/build/emtests.rs diff --git a/lib/emscripten/build/mod.rs b/lib/emscripten-tests/build/mod.rs similarity index 100% rename from lib/emscripten/build/mod.rs rename to lib/emscripten-tests/build/mod.rs diff --git a/lib/emscripten/emtests/FS_exports.cpp b/lib/emscripten-tests/emtests/FS_exports.cpp similarity index 100% rename from lib/emscripten/emtests/FS_exports.cpp rename to lib/emscripten-tests/emtests/FS_exports.cpp diff --git a/lib/emscripten/emtests/FS_exports.txt b/lib/emscripten-tests/emtests/FS_exports.txt similarity index 100% rename from lib/emscripten/emtests/FS_exports.txt rename to lib/emscripten-tests/emtests/FS_exports.txt diff --git a/lib/emscripten/emtests/FS_exports.wasm b/lib/emscripten-tests/emtests/FS_exports.wasm similarity index 100% rename from lib/emscripten/emtests/FS_exports.wasm rename to lib/emscripten-tests/emtests/FS_exports.wasm diff --git a/lib/emscripten/emtests/FS_exports_2.txt b/lib/emscripten-tests/emtests/FS_exports_2.txt similarity index 100% rename from lib/emscripten/emtests/FS_exports_2.txt rename to lib/emscripten-tests/emtests/FS_exports_2.txt diff --git a/lib/emscripten/emtests/FS_exports_assert.txt b/lib/emscripten-tests/emtests/FS_exports_assert.txt similarity index 100% rename from lib/emscripten/emtests/FS_exports_assert.txt rename to lib/emscripten-tests/emtests/FS_exports_assert.txt diff --git a/lib/emscripten/emtests/FS_exports_assert_2.txt b/lib/emscripten-tests/emtests/FS_exports_assert_2.txt similarity index 100% rename from lib/emscripten/emtests/FS_exports_assert_2.txt rename to lib/emscripten-tests/emtests/FS_exports_assert_2.txt diff --git a/lib/emscripten/emtests/README.md b/lib/emscripten-tests/emtests/README.md similarity index 100% rename from lib/emscripten/emtests/README.md rename to lib/emscripten-tests/emtests/README.md diff --git a/lib/emscripten/emtests/clock_gettime.c b/lib/emscripten-tests/emtests/clock_gettime.c similarity index 100% rename from lib/emscripten/emtests/clock_gettime.c rename to lib/emscripten-tests/emtests/clock_gettime.c diff --git a/lib/emscripten/emtests/clock_gettime.out b/lib/emscripten-tests/emtests/clock_gettime.out similarity index 100% rename from lib/emscripten/emtests/clock_gettime.out rename to lib/emscripten-tests/emtests/clock_gettime.out diff --git a/lib/emscripten/emtests/clock_gettime.wasm b/lib/emscripten-tests/emtests/clock_gettime.wasm similarity index 100% rename from lib/emscripten/emtests/clock_gettime.wasm rename to lib/emscripten-tests/emtests/clock_gettime.wasm diff --git a/lib/emscripten/emtests/closebitcasts.c b/lib/emscripten-tests/emtests/closebitcasts.c similarity index 100% rename from lib/emscripten/emtests/closebitcasts.c rename to lib/emscripten-tests/emtests/closebitcasts.c diff --git a/lib/emscripten/emtests/closebitcasts.txt b/lib/emscripten-tests/emtests/closebitcasts.txt similarity index 100% rename from lib/emscripten/emtests/closebitcasts.txt rename to lib/emscripten-tests/emtests/closebitcasts.txt diff --git a/lib/emscripten/emtests/closebitcasts.wasm b/lib/emscripten-tests/emtests/closebitcasts.wasm similarity index 100% rename from lib/emscripten/emtests/closebitcasts.wasm rename to lib/emscripten-tests/emtests/closebitcasts.wasm diff --git a/lib/emscripten/emtests/dyncall.c b/lib/emscripten-tests/emtests/dyncall.c similarity index 100% rename from lib/emscripten/emtests/dyncall.c rename to lib/emscripten-tests/emtests/dyncall.c diff --git a/lib/emscripten/emtests/dyncall.txt b/lib/emscripten-tests/emtests/dyncall.txt similarity index 100% rename from lib/emscripten/emtests/dyncall.txt rename to lib/emscripten-tests/emtests/dyncall.txt diff --git a/lib/emscripten/emtests/dyncall.wasm b/lib/emscripten-tests/emtests/dyncall.wasm similarity index 100% rename from lib/emscripten/emtests/dyncall.wasm rename to lib/emscripten-tests/emtests/dyncall.wasm diff --git a/lib/emscripten/emtests/dyncall_specific.c b/lib/emscripten-tests/emtests/dyncall_specific.c similarity index 100% rename from lib/emscripten/emtests/dyncall_specific.c rename to lib/emscripten-tests/emtests/dyncall_specific.c diff --git a/lib/emscripten/emtests/dyncall_specific.txt b/lib/emscripten-tests/emtests/dyncall_specific.txt similarity index 100% rename from lib/emscripten/emtests/dyncall_specific.txt rename to lib/emscripten-tests/emtests/dyncall_specific.txt diff --git a/lib/emscripten/emtests/dyncall_specific.wasm b/lib/emscripten-tests/emtests/dyncall_specific.wasm similarity index 100% rename from lib/emscripten/emtests/dyncall_specific.wasm rename to lib/emscripten-tests/emtests/dyncall_specific.wasm diff --git a/lib/emscripten/emtests/emscripten_get_compiler_setting.c b/lib/emscripten-tests/emtests/emscripten_get_compiler_setting.c similarity index 100% rename from lib/emscripten/emtests/emscripten_get_compiler_setting.c rename to lib/emscripten-tests/emtests/emscripten_get_compiler_setting.c diff --git a/lib/emscripten/emtests/emscripten_get_compiler_setting.out b/lib/emscripten-tests/emtests/emscripten_get_compiler_setting.out similarity index 100% rename from lib/emscripten/emtests/emscripten_get_compiler_setting.out rename to lib/emscripten-tests/emtests/emscripten_get_compiler_setting.out diff --git a/lib/emscripten/emtests/emscripten_get_compiler_setting.wasm b/lib/emscripten-tests/emtests/emscripten_get_compiler_setting.wasm similarity index 100% rename from lib/emscripten/emtests/emscripten_get_compiler_setting.wasm rename to lib/emscripten-tests/emtests/emscripten_get_compiler_setting.wasm diff --git a/lib/emscripten/emtests/env.c b/lib/emscripten-tests/emtests/env.c similarity index 100% rename from lib/emscripten/emtests/env.c rename to lib/emscripten-tests/emtests/env.c diff --git a/lib/emscripten/emtests/env.out b/lib/emscripten-tests/emtests/env.out similarity index 100% rename from lib/emscripten/emtests/env.out rename to lib/emscripten-tests/emtests/env.out diff --git a/lib/emscripten/emtests/env.wasm b/lib/emscripten-tests/emtests/env.wasm similarity index 100% rename from lib/emscripten/emtests/env.wasm rename to lib/emscripten-tests/emtests/env.wasm diff --git a/lib/emscripten/emtests/fnmatch.c b/lib/emscripten-tests/emtests/fnmatch.c similarity index 100% rename from lib/emscripten/emtests/fnmatch.c rename to lib/emscripten-tests/emtests/fnmatch.c diff --git a/lib/emscripten/emtests/fnmatch.out b/lib/emscripten-tests/emtests/fnmatch.out similarity index 100% rename from lib/emscripten/emtests/fnmatch.out rename to lib/emscripten-tests/emtests/fnmatch.out diff --git a/lib/emscripten/emtests/getValue_setValue.cpp b/lib/emscripten-tests/emtests/getValue_setValue.cpp similarity index 100% rename from lib/emscripten/emtests/getValue_setValue.cpp rename to lib/emscripten-tests/emtests/getValue_setValue.cpp diff --git a/lib/emscripten/emtests/getValue_setValue.txt b/lib/emscripten-tests/emtests/getValue_setValue.txt similarity index 100% rename from lib/emscripten/emtests/getValue_setValue.txt rename to lib/emscripten-tests/emtests/getValue_setValue.txt diff --git a/lib/emscripten/emtests/getValue_setValue.wasm b/lib/emscripten-tests/emtests/getValue_setValue.wasm similarity index 100% rename from lib/emscripten/emtests/getValue_setValue.wasm rename to lib/emscripten-tests/emtests/getValue_setValue.wasm diff --git a/lib/emscripten/emtests/getValue_setValue_assert.txt b/lib/emscripten-tests/emtests/getValue_setValue_assert.txt similarity index 100% rename from lib/emscripten/emtests/getValue_setValue_assert.txt rename to lib/emscripten-tests/emtests/getValue_setValue_assert.txt diff --git a/lib/emscripten/emtests/hello.cpp b/lib/emscripten-tests/emtests/hello.cpp similarity index 100% rename from lib/emscripten/emtests/hello.cpp rename to lib/emscripten-tests/emtests/hello.cpp diff --git a/lib/emscripten/emtests/hello.out b/lib/emscripten-tests/emtests/hello.out similarity index 100% rename from lib/emscripten/emtests/hello.out rename to lib/emscripten-tests/emtests/hello.out diff --git a/lib/emscripten/emtests/hello.wasm b/lib/emscripten-tests/emtests/hello.wasm similarity index 100% rename from lib/emscripten/emtests/hello.wasm rename to lib/emscripten-tests/emtests/hello.wasm diff --git a/lib/emscripten/emtests/ignores.txt b/lib/emscripten-tests/emtests/ignores.txt similarity index 100% rename from lib/emscripten/emtests/ignores.txt rename to lib/emscripten-tests/emtests/ignores.txt diff --git a/lib/emscripten/emtests/legacy_exported_runtime_numbers.cpp b/lib/emscripten-tests/emtests/legacy_exported_runtime_numbers.cpp similarity index 100% rename from lib/emscripten/emtests/legacy_exported_runtime_numbers.cpp rename to lib/emscripten-tests/emtests/legacy_exported_runtime_numbers.cpp diff --git a/lib/emscripten/emtests/legacy_exported_runtime_numbers.txt b/lib/emscripten-tests/emtests/legacy_exported_runtime_numbers.txt similarity index 100% rename from lib/emscripten/emtests/legacy_exported_runtime_numbers.txt rename to lib/emscripten-tests/emtests/legacy_exported_runtime_numbers.txt diff --git a/lib/emscripten/emtests/legacy_exported_runtime_numbers.wasm b/lib/emscripten-tests/emtests/legacy_exported_runtime_numbers.wasm similarity index 100% rename from lib/emscripten/emtests/legacy_exported_runtime_numbers.wasm rename to lib/emscripten-tests/emtests/legacy_exported_runtime_numbers.wasm diff --git a/lib/emscripten/emtests/legacy_exported_runtime_numbers_assert.txt b/lib/emscripten-tests/emtests/legacy_exported_runtime_numbers_assert.txt similarity index 100% rename from lib/emscripten/emtests/legacy_exported_runtime_numbers_assert.txt rename to lib/emscripten-tests/emtests/legacy_exported_runtime_numbers_assert.txt diff --git a/lib/emscripten/emtests/localtime.c b/lib/emscripten-tests/emtests/localtime.c similarity index 100% rename from lib/emscripten/emtests/localtime.c rename to lib/emscripten-tests/emtests/localtime.c diff --git a/lib/emscripten/emtests/localtime.out b/lib/emscripten-tests/emtests/localtime.out similarity index 100% rename from lib/emscripten/emtests/localtime.out rename to lib/emscripten-tests/emtests/localtime.out diff --git a/lib/emscripten/emtests/localtime.wasm b/lib/emscripten-tests/emtests/localtime.wasm similarity index 100% rename from lib/emscripten/emtests/localtime.wasm rename to lib/emscripten-tests/emtests/localtime.wasm diff --git a/lib/emscripten/emtests/modularize_closure_pre.c b/lib/emscripten-tests/emtests/modularize_closure_pre.c similarity index 100% rename from lib/emscripten/emtests/modularize_closure_pre.c rename to lib/emscripten-tests/emtests/modularize_closure_pre.c diff --git a/lib/emscripten/emtests/modularize_closure_pre.out b/lib/emscripten-tests/emtests/modularize_closure_pre.out similarity index 100% rename from lib/emscripten/emtests/modularize_closure_pre.out rename to lib/emscripten-tests/emtests/modularize_closure_pre.out diff --git a/lib/emscripten/emtests/modularize_closure_pre.wasm b/lib/emscripten-tests/emtests/modularize_closure_pre.wasm similarity index 100% rename from lib/emscripten/emtests/modularize_closure_pre.wasm rename to lib/emscripten-tests/emtests/modularize_closure_pre.wasm diff --git a/lib/emscripten/emtests/printf.c b/lib/emscripten-tests/emtests/printf.c similarity index 100% rename from lib/emscripten/emtests/printf.c rename to lib/emscripten-tests/emtests/printf.c diff --git a/lib/emscripten/emtests/printf.out b/lib/emscripten-tests/emtests/printf.out similarity index 100% rename from lib/emscripten/emtests/printf.out rename to lib/emscripten-tests/emtests/printf.out diff --git a/lib/emscripten/emtests/printf.wasm b/lib/emscripten-tests/emtests/printf.wasm similarity index 100% rename from lib/emscripten/emtests/printf.wasm rename to lib/emscripten-tests/emtests/printf.wasm diff --git a/lib/emscripten/emtests/puts.c b/lib/emscripten-tests/emtests/puts.c similarity index 100% rename from lib/emscripten/emtests/puts.c rename to lib/emscripten-tests/emtests/puts.c diff --git a/lib/emscripten/emtests/puts.out b/lib/emscripten-tests/emtests/puts.out similarity index 100% rename from lib/emscripten/emtests/puts.out rename to lib/emscripten-tests/emtests/puts.out diff --git a/lib/emscripten/emtests/puts.wasm b/lib/emscripten-tests/emtests/puts.wasm similarity index 100% rename from lib/emscripten/emtests/puts.wasm rename to lib/emscripten-tests/emtests/puts.wasm diff --git a/lib/emscripten/emtests/stackAlloc.cpp b/lib/emscripten-tests/emtests/stackAlloc.cpp similarity index 100% rename from lib/emscripten/emtests/stackAlloc.cpp rename to lib/emscripten-tests/emtests/stackAlloc.cpp diff --git a/lib/emscripten/emtests/stackAlloc.txt b/lib/emscripten-tests/emtests/stackAlloc.txt similarity index 100% rename from lib/emscripten/emtests/stackAlloc.txt rename to lib/emscripten-tests/emtests/stackAlloc.txt diff --git a/lib/emscripten/emtests/stackAlloc.wasm b/lib/emscripten-tests/emtests/stackAlloc.wasm similarity index 100% rename from lib/emscripten/emtests/stackAlloc.wasm rename to lib/emscripten-tests/emtests/stackAlloc.wasm diff --git a/lib/emscripten/emtests/stack_overflow.cpp b/lib/emscripten-tests/emtests/stack_overflow.cpp similarity index 100% rename from lib/emscripten/emtests/stack_overflow.cpp rename to lib/emscripten-tests/emtests/stack_overflow.cpp diff --git a/lib/emscripten/emtests/stack_overflow.wasm b/lib/emscripten-tests/emtests/stack_overflow.wasm similarity index 100% rename from lib/emscripten/emtests/stack_overflow.wasm rename to lib/emscripten-tests/emtests/stack_overflow.wasm diff --git a/lib/emscripten/emtests/test_addr_of_stacked.c b/lib/emscripten-tests/emtests/test_addr_of_stacked.c similarity index 100% rename from lib/emscripten/emtests/test_addr_of_stacked.c rename to lib/emscripten-tests/emtests/test_addr_of_stacked.c diff --git a/lib/emscripten/emtests/test_addr_of_stacked.out b/lib/emscripten-tests/emtests/test_addr_of_stacked.out similarity index 100% rename from lib/emscripten/emtests/test_addr_of_stacked.out rename to lib/emscripten-tests/emtests/test_addr_of_stacked.out diff --git a/lib/emscripten/emtests/test_addr_of_stacked.wasm b/lib/emscripten-tests/emtests/test_addr_of_stacked.wasm similarity index 100% rename from lib/emscripten/emtests/test_addr_of_stacked.wasm rename to lib/emscripten-tests/emtests/test_addr_of_stacked.wasm diff --git a/lib/emscripten/emtests/test_alloca.c b/lib/emscripten-tests/emtests/test_alloca.c similarity index 100% rename from lib/emscripten/emtests/test_alloca.c rename to lib/emscripten-tests/emtests/test_alloca.c diff --git a/lib/emscripten/emtests/test_alloca.out b/lib/emscripten-tests/emtests/test_alloca.out similarity index 100% rename from lib/emscripten/emtests/test_alloca.out rename to lib/emscripten-tests/emtests/test_alloca.out diff --git a/lib/emscripten/emtests/test_alloca.wasm b/lib/emscripten-tests/emtests/test_alloca.wasm similarity index 100% rename from lib/emscripten/emtests/test_alloca.wasm rename to lib/emscripten-tests/emtests/test_alloca.wasm diff --git a/lib/emscripten/emtests/test_alloca_stack.c b/lib/emscripten-tests/emtests/test_alloca_stack.c similarity index 100% rename from lib/emscripten/emtests/test_alloca_stack.c rename to lib/emscripten-tests/emtests/test_alloca_stack.c diff --git a/lib/emscripten/emtests/test_alloca_stack.out b/lib/emscripten-tests/emtests/test_alloca_stack.out similarity index 100% rename from lib/emscripten/emtests/test_alloca_stack.out rename to lib/emscripten-tests/emtests/test_alloca_stack.out diff --git a/lib/emscripten/emtests/test_alloca_stack.wasm b/lib/emscripten-tests/emtests/test_alloca_stack.wasm similarity index 100% rename from lib/emscripten/emtests/test_alloca_stack.wasm rename to lib/emscripten-tests/emtests/test_alloca_stack.wasm diff --git a/lib/emscripten/emtests/test_array2.c b/lib/emscripten-tests/emtests/test_array2.c similarity index 100% rename from lib/emscripten/emtests/test_array2.c rename to lib/emscripten-tests/emtests/test_array2.c diff --git a/lib/emscripten/emtests/test_array2.out b/lib/emscripten-tests/emtests/test_array2.out similarity index 100% rename from lib/emscripten/emtests/test_array2.out rename to lib/emscripten-tests/emtests/test_array2.out diff --git a/lib/emscripten/emtests/test_array2.wasm b/lib/emscripten-tests/emtests/test_array2.wasm similarity index 100% rename from lib/emscripten/emtests/test_array2.wasm rename to lib/emscripten-tests/emtests/test_array2.wasm diff --git a/lib/emscripten/emtests/test_array2b.c b/lib/emscripten-tests/emtests/test_array2b.c similarity index 100% rename from lib/emscripten/emtests/test_array2b.c rename to lib/emscripten-tests/emtests/test_array2b.c diff --git a/lib/emscripten/emtests/test_array2b.out b/lib/emscripten-tests/emtests/test_array2b.out similarity index 100% rename from lib/emscripten/emtests/test_array2b.out rename to lib/emscripten-tests/emtests/test_array2b.out diff --git a/lib/emscripten/emtests/test_array2b.wasm b/lib/emscripten-tests/emtests/test_array2b.wasm similarity index 100% rename from lib/emscripten/emtests/test_array2b.wasm rename to lib/emscripten-tests/emtests/test_array2b.wasm diff --git a/lib/emscripten/emtests/test_assert.c b/lib/emscripten-tests/emtests/test_assert.c similarity index 100% rename from lib/emscripten/emtests/test_assert.c rename to lib/emscripten-tests/emtests/test_assert.c diff --git a/lib/emscripten/emtests/test_assert.out b/lib/emscripten-tests/emtests/test_assert.out similarity index 100% rename from lib/emscripten/emtests/test_assert.out rename to lib/emscripten-tests/emtests/test_assert.out diff --git a/lib/emscripten/emtests/test_atexit.c b/lib/emscripten-tests/emtests/test_atexit.c similarity index 100% rename from lib/emscripten/emtests/test_atexit.c rename to lib/emscripten-tests/emtests/test_atexit.c diff --git a/lib/emscripten/emtests/test_atexit.out b/lib/emscripten-tests/emtests/test_atexit.out similarity index 100% rename from lib/emscripten/emtests/test_atexit.out rename to lib/emscripten-tests/emtests/test_atexit.out diff --git a/lib/emscripten/emtests/test_atoX.c b/lib/emscripten-tests/emtests/test_atoX.c similarity index 100% rename from lib/emscripten/emtests/test_atoX.c rename to lib/emscripten-tests/emtests/test_atoX.c diff --git a/lib/emscripten/emtests/test_atoX.out b/lib/emscripten-tests/emtests/test_atoX.out similarity index 100% rename from lib/emscripten/emtests/test_atoX.out rename to lib/emscripten-tests/emtests/test_atoX.out diff --git a/lib/emscripten/emtests/test_atoX.wasm b/lib/emscripten-tests/emtests/test_atoX.wasm similarity index 100% rename from lib/emscripten/emtests/test_atoX.wasm rename to lib/emscripten-tests/emtests/test_atoX.wasm diff --git a/lib/emscripten/emtests/test_atomic.c b/lib/emscripten-tests/emtests/test_atomic.c similarity index 100% rename from lib/emscripten/emtests/test_atomic.c rename to lib/emscripten-tests/emtests/test_atomic.c diff --git a/lib/emscripten/emtests/test_atomic.out b/lib/emscripten-tests/emtests/test_atomic.out similarity index 100% rename from lib/emscripten/emtests/test_atomic.out rename to lib/emscripten-tests/emtests/test_atomic.out diff --git a/lib/emscripten/emtests/test_atomic.wasm b/lib/emscripten-tests/emtests/test_atomic.wasm similarity index 100% rename from lib/emscripten/emtests/test_atomic.wasm rename to lib/emscripten-tests/emtests/test_atomic.wasm diff --git a/lib/emscripten/emtests/test_atomic_cxx.cpp b/lib/emscripten-tests/emtests/test_atomic_cxx.cpp similarity index 100% rename from lib/emscripten/emtests/test_atomic_cxx.cpp rename to lib/emscripten-tests/emtests/test_atomic_cxx.cpp diff --git a/lib/emscripten/emtests/test_atomic_cxx.txt b/lib/emscripten-tests/emtests/test_atomic_cxx.txt similarity index 100% rename from lib/emscripten/emtests/test_atomic_cxx.txt rename to lib/emscripten-tests/emtests/test_atomic_cxx.txt diff --git a/lib/emscripten/emtests/test_atomic_cxx.wasm b/lib/emscripten-tests/emtests/test_atomic_cxx.wasm similarity index 100% rename from lib/emscripten/emtests/test_atomic_cxx.wasm rename to lib/emscripten-tests/emtests/test_atomic_cxx.wasm diff --git a/lib/emscripten/emtests/test_bigarray.c b/lib/emscripten-tests/emtests/test_bigarray.c similarity index 100% rename from lib/emscripten/emtests/test_bigarray.c rename to lib/emscripten-tests/emtests/test_bigarray.c diff --git a/lib/emscripten/emtests/test_bigarray.out b/lib/emscripten-tests/emtests/test_bigarray.out similarity index 100% rename from lib/emscripten/emtests/test_bigarray.out rename to lib/emscripten-tests/emtests/test_bigarray.out diff --git a/lib/emscripten/emtests/test_bitfields.c b/lib/emscripten-tests/emtests/test_bitfields.c similarity index 100% rename from lib/emscripten/emtests/test_bitfields.c rename to lib/emscripten-tests/emtests/test_bitfields.c diff --git a/lib/emscripten/emtests/test_bitfields.out b/lib/emscripten-tests/emtests/test_bitfields.out similarity index 100% rename from lib/emscripten/emtests/test_bitfields.out rename to lib/emscripten-tests/emtests/test_bitfields.out diff --git a/lib/emscripten/emtests/test_bsearch.c b/lib/emscripten-tests/emtests/test_bsearch.c similarity index 100% rename from lib/emscripten/emtests/test_bsearch.c rename to lib/emscripten-tests/emtests/test_bsearch.c diff --git a/lib/emscripten/emtests/test_bsearch.out b/lib/emscripten-tests/emtests/test_bsearch.out similarity index 100% rename from lib/emscripten/emtests/test_bsearch.out rename to lib/emscripten-tests/emtests/test_bsearch.out diff --git a/lib/emscripten/emtests/test_bsearch.wasm b/lib/emscripten-tests/emtests/test_bsearch.wasm similarity index 100% rename from lib/emscripten/emtests/test_bsearch.wasm rename to lib/emscripten-tests/emtests/test_bsearch.wasm diff --git a/lib/emscripten/emtests/test_bswap64.c b/lib/emscripten-tests/emtests/test_bswap64.c similarity index 100% rename from lib/emscripten/emtests/test_bswap64.c rename to lib/emscripten-tests/emtests/test_bswap64.c diff --git a/lib/emscripten/emtests/test_bswap64.out b/lib/emscripten-tests/emtests/test_bswap64.out similarity index 100% rename from lib/emscripten/emtests/test_bswap64.out rename to lib/emscripten-tests/emtests/test_bswap64.out diff --git a/lib/emscripten/emtests/test_ccall.cpp b/lib/emscripten-tests/emtests/test_ccall.cpp similarity index 100% rename from lib/emscripten/emtests/test_ccall.cpp rename to lib/emscripten-tests/emtests/test_ccall.cpp diff --git a/lib/emscripten/emtests/test_ccall.out b/lib/emscripten-tests/emtests/test_ccall.out similarity index 100% rename from lib/emscripten/emtests/test_ccall.out rename to lib/emscripten-tests/emtests/test_ccall.out diff --git a/lib/emscripten/emtests/test_ccall.wasm b/lib/emscripten-tests/emtests/test_ccall.wasm similarity index 100% rename from lib/emscripten/emtests/test_ccall.wasm rename to lib/emscripten-tests/emtests/test_ccall.wasm diff --git a/lib/emscripten/emtests/test_class.c b/lib/emscripten-tests/emtests/test_class.c similarity index 100% rename from lib/emscripten/emtests/test_class.c rename to lib/emscripten-tests/emtests/test_class.c diff --git a/lib/emscripten/emtests/test_class.out b/lib/emscripten-tests/emtests/test_class.out similarity index 100% rename from lib/emscripten/emtests/test_class.out rename to lib/emscripten-tests/emtests/test_class.out diff --git a/lib/emscripten/emtests/test_complex.c b/lib/emscripten-tests/emtests/test_complex.c similarity index 100% rename from lib/emscripten/emtests/test_complex.c rename to lib/emscripten-tests/emtests/test_complex.c diff --git a/lib/emscripten/emtests/test_complex.out b/lib/emscripten-tests/emtests/test_complex.out similarity index 100% rename from lib/emscripten/emtests/test_complex.out rename to lib/emscripten-tests/emtests/test_complex.out diff --git a/lib/emscripten/emtests/test_complex.wasm b/lib/emscripten-tests/emtests/test_complex.wasm similarity index 100% rename from lib/emscripten/emtests/test_complex.wasm rename to lib/emscripten-tests/emtests/test_complex.wasm diff --git a/lib/emscripten/emtests/test_constglobalstructs.c b/lib/emscripten-tests/emtests/test_constglobalstructs.c similarity index 100% rename from lib/emscripten/emtests/test_constglobalstructs.c rename to lib/emscripten-tests/emtests/test_constglobalstructs.c diff --git a/lib/emscripten/emtests/test_constglobalstructs.out b/lib/emscripten-tests/emtests/test_constglobalstructs.out similarity index 100% rename from lib/emscripten/emtests/test_constglobalstructs.out rename to lib/emscripten-tests/emtests/test_constglobalstructs.out diff --git a/lib/emscripten/emtests/test_conststructs.c b/lib/emscripten-tests/emtests/test_conststructs.c similarity index 100% rename from lib/emscripten/emtests/test_conststructs.c rename to lib/emscripten-tests/emtests/test_conststructs.c diff --git a/lib/emscripten/emtests/test_conststructs.out b/lib/emscripten-tests/emtests/test_conststructs.out similarity index 100% rename from lib/emscripten/emtests/test_conststructs.out rename to lib/emscripten-tests/emtests/test_conststructs.out diff --git a/lib/emscripten/emtests/test_copyop.c b/lib/emscripten-tests/emtests/test_copyop.c similarity index 100% rename from lib/emscripten/emtests/test_copyop.c rename to lib/emscripten-tests/emtests/test_copyop.c diff --git a/lib/emscripten/emtests/test_copyop.out b/lib/emscripten-tests/emtests/test_copyop.out similarity index 100% rename from lib/emscripten/emtests/test_copyop.out rename to lib/emscripten-tests/emtests/test_copyop.out diff --git a/lib/emscripten/emtests/test_cxx03_do_run.c b/lib/emscripten-tests/emtests/test_cxx03_do_run.c similarity index 100% rename from lib/emscripten/emtests/test_cxx03_do_run.c rename to lib/emscripten-tests/emtests/test_cxx03_do_run.c diff --git a/lib/emscripten/emtests/test_cxx03_do_run.out b/lib/emscripten-tests/emtests/test_cxx03_do_run.out similarity index 100% rename from lib/emscripten/emtests/test_cxx03_do_run.out rename to lib/emscripten-tests/emtests/test_cxx03_do_run.out diff --git a/lib/emscripten/emtests/test_demangle_stacks.cpp b/lib/emscripten-tests/emtests/test_demangle_stacks.cpp similarity index 100% rename from lib/emscripten/emtests/test_demangle_stacks.cpp rename to lib/emscripten-tests/emtests/test_demangle_stacks.cpp diff --git a/lib/emscripten/emtests/test_demangle_stacks.out b/lib/emscripten-tests/emtests/test_demangle_stacks.out similarity index 100% rename from lib/emscripten/emtests/test_demangle_stacks.out rename to lib/emscripten-tests/emtests/test_demangle_stacks.out diff --git a/lib/emscripten/emtests/test_demangle_stacks.wasm b/lib/emscripten-tests/emtests/test_demangle_stacks.wasm similarity index 100% rename from lib/emscripten/emtests/test_demangle_stacks.wasm rename to lib/emscripten-tests/emtests/test_demangle_stacks.wasm diff --git a/lib/emscripten/emtests/test_demangle_stacks_noassert.cpp b/lib/emscripten-tests/emtests/test_demangle_stacks_noassert.cpp similarity index 100% rename from lib/emscripten/emtests/test_demangle_stacks_noassert.cpp rename to lib/emscripten-tests/emtests/test_demangle_stacks_noassert.cpp diff --git a/lib/emscripten/emtests/test_demangle_stacks_noassert.out b/lib/emscripten-tests/emtests/test_demangle_stacks_noassert.out similarity index 100% rename from lib/emscripten/emtests/test_demangle_stacks_noassert.out rename to lib/emscripten-tests/emtests/test_demangle_stacks_noassert.out diff --git a/lib/emscripten/emtests/test_demangle_stacks_noassert.wasm b/lib/emscripten-tests/emtests/test_demangle_stacks_noassert.wasm similarity index 100% rename from lib/emscripten/emtests/test_demangle_stacks_noassert.wasm rename to lib/emscripten-tests/emtests/test_demangle_stacks_noassert.wasm diff --git a/lib/emscripten/emtests/test_direct_string_constant_usage.c b/lib/emscripten-tests/emtests/test_direct_string_constant_usage.c similarity index 100% rename from lib/emscripten/emtests/test_direct_string_constant_usage.c rename to lib/emscripten-tests/emtests/test_direct_string_constant_usage.c diff --git a/lib/emscripten/emtests/test_direct_string_constant_usage.out b/lib/emscripten-tests/emtests/test_direct_string_constant_usage.out similarity index 100% rename from lib/emscripten/emtests/test_direct_string_constant_usage.out rename to lib/emscripten-tests/emtests/test_direct_string_constant_usage.out diff --git a/lib/emscripten/emtests/test_dlfcn_self.c b/lib/emscripten-tests/emtests/test_dlfcn_self.c similarity index 100% rename from lib/emscripten/emtests/test_dlfcn_self.c rename to lib/emscripten-tests/emtests/test_dlfcn_self.c diff --git a/lib/emscripten/emtests/test_dlfcn_self.out b/lib/emscripten-tests/emtests/test_dlfcn_self.out similarity index 100% rename from lib/emscripten/emtests/test_dlfcn_self.out rename to lib/emscripten-tests/emtests/test_dlfcn_self.out diff --git a/lib/emscripten/emtests/test_dlmalloc_partial_2.c b/lib/emscripten-tests/emtests/test_dlmalloc_partial_2.c similarity index 100% rename from lib/emscripten/emtests/test_dlmalloc_partial_2.c rename to lib/emscripten-tests/emtests/test_dlmalloc_partial_2.c diff --git a/lib/emscripten/emtests/test_dlmalloc_partial_2.out b/lib/emscripten-tests/emtests/test_dlmalloc_partial_2.out similarity index 100% rename from lib/emscripten/emtests/test_dlmalloc_partial_2.out rename to lib/emscripten-tests/emtests/test_dlmalloc_partial_2.out diff --git a/lib/emscripten/emtests/test_dlmalloc_partial_2.wasm b/lib/emscripten-tests/emtests/test_dlmalloc_partial_2.wasm similarity index 100% rename from lib/emscripten/emtests/test_dlmalloc_partial_2.wasm rename to lib/emscripten-tests/emtests/test_dlmalloc_partial_2.wasm diff --git a/lib/emscripten/emtests/test_double_i64_conversion.c b/lib/emscripten-tests/emtests/test_double_i64_conversion.c similarity index 100% rename from lib/emscripten/emtests/test_double_i64_conversion.c rename to lib/emscripten-tests/emtests/test_double_i64_conversion.c diff --git a/lib/emscripten/emtests/test_double_i64_conversion.out b/lib/emscripten-tests/emtests/test_double_i64_conversion.out similarity index 100% rename from lib/emscripten/emtests/test_double_i64_conversion.out rename to lib/emscripten-tests/emtests/test_double_i64_conversion.out diff --git a/lib/emscripten/emtests/test_double_varargs.c b/lib/emscripten-tests/emtests/test_double_varargs.c similarity index 100% rename from lib/emscripten/emtests/test_double_varargs.c rename to lib/emscripten-tests/emtests/test_double_varargs.c diff --git a/lib/emscripten/emtests/test_double_varargs.out b/lib/emscripten-tests/emtests/test_double_varargs.out similarity index 100% rename from lib/emscripten/emtests/test_double_varargs.out rename to lib/emscripten-tests/emtests/test_double_varargs.out diff --git a/lib/emscripten/emtests/test_double_varargs.wasm b/lib/emscripten-tests/emtests/test_double_varargs.wasm similarity index 100% rename from lib/emscripten/emtests/test_double_varargs.wasm rename to lib/emscripten-tests/emtests/test_double_varargs.wasm diff --git a/lib/emscripten/emtests/test_dynamic_cast.c b/lib/emscripten-tests/emtests/test_dynamic_cast.c similarity index 100% rename from lib/emscripten/emtests/test_dynamic_cast.c rename to lib/emscripten-tests/emtests/test_dynamic_cast.c diff --git a/lib/emscripten/emtests/test_dynamic_cast.out b/lib/emscripten-tests/emtests/test_dynamic_cast.out similarity index 100% rename from lib/emscripten/emtests/test_dynamic_cast.out rename to lib/emscripten-tests/emtests/test_dynamic_cast.out diff --git a/lib/emscripten/emtests/test_dynamic_cast_2.c b/lib/emscripten-tests/emtests/test_dynamic_cast_2.c similarity index 100% rename from lib/emscripten/emtests/test_dynamic_cast_2.c rename to lib/emscripten-tests/emtests/test_dynamic_cast_2.c diff --git a/lib/emscripten/emtests/test_dynamic_cast_2.out b/lib/emscripten-tests/emtests/test_dynamic_cast_2.out similarity index 100% rename from lib/emscripten/emtests/test_dynamic_cast_2.out rename to lib/emscripten-tests/emtests/test_dynamic_cast_2.out diff --git a/lib/emscripten/emtests/test_dynamic_cast_b.c b/lib/emscripten-tests/emtests/test_dynamic_cast_b.c similarity index 100% rename from lib/emscripten/emtests/test_dynamic_cast_b.c rename to lib/emscripten-tests/emtests/test_dynamic_cast_b.c diff --git a/lib/emscripten/emtests/test_dynamic_cast_b.out b/lib/emscripten-tests/emtests/test_dynamic_cast_b.out similarity index 100% rename from lib/emscripten/emtests/test_dynamic_cast_b.out rename to lib/emscripten-tests/emtests/test_dynamic_cast_b.out diff --git a/lib/emscripten/emtests/test_em_asm.cpp b/lib/emscripten-tests/emtests/test_em_asm.cpp similarity index 100% rename from lib/emscripten/emtests/test_em_asm.cpp rename to lib/emscripten-tests/emtests/test_em_asm.cpp diff --git a/lib/emscripten/emtests/test_em_asm.out b/lib/emscripten-tests/emtests/test_em_asm.out similarity index 100% rename from lib/emscripten/emtests/test_em_asm.out rename to lib/emscripten-tests/emtests/test_em_asm.out diff --git a/lib/emscripten/emtests/test_em_asm.wasm b/lib/emscripten-tests/emtests/test_em_asm.wasm similarity index 100% rename from lib/emscripten/emtests/test_em_asm.wasm rename to lib/emscripten-tests/emtests/test_em_asm.wasm diff --git a/lib/emscripten/emtests/test_em_asm_2.cpp b/lib/emscripten-tests/emtests/test_em_asm_2.cpp similarity index 100% rename from lib/emscripten/emtests/test_em_asm_2.cpp rename to lib/emscripten-tests/emtests/test_em_asm_2.cpp diff --git a/lib/emscripten/emtests/test_em_asm_2.out b/lib/emscripten-tests/emtests/test_em_asm_2.out similarity index 100% rename from lib/emscripten/emtests/test_em_asm_2.out rename to lib/emscripten-tests/emtests/test_em_asm_2.out diff --git a/lib/emscripten/emtests/test_em_asm_2.wasm b/lib/emscripten-tests/emtests/test_em_asm_2.wasm similarity index 100% rename from lib/emscripten/emtests/test_em_asm_2.wasm rename to lib/emscripten-tests/emtests/test_em_asm_2.wasm diff --git a/lib/emscripten/emtests/test_em_asm_parameter_pack.cpp b/lib/emscripten-tests/emtests/test_em_asm_parameter_pack.cpp similarity index 100% rename from lib/emscripten/emtests/test_em_asm_parameter_pack.cpp rename to lib/emscripten-tests/emtests/test_em_asm_parameter_pack.cpp diff --git a/lib/emscripten/emtests/test_em_asm_parameter_pack.out b/lib/emscripten-tests/emtests/test_em_asm_parameter_pack.out similarity index 100% rename from lib/emscripten/emtests/test_em_asm_parameter_pack.out rename to lib/emscripten-tests/emtests/test_em_asm_parameter_pack.out diff --git a/lib/emscripten/emtests/test_em_asm_parameter_pack.wasm b/lib/emscripten-tests/emtests/test_em_asm_parameter_pack.wasm similarity index 100% rename from lib/emscripten/emtests/test_em_asm_parameter_pack.wasm rename to lib/emscripten-tests/emtests/test_em_asm_parameter_pack.wasm diff --git a/lib/emscripten/emtests/test_em_asm_signatures.cpp b/lib/emscripten-tests/emtests/test_em_asm_signatures.cpp similarity index 100% rename from lib/emscripten/emtests/test_em_asm_signatures.cpp rename to lib/emscripten-tests/emtests/test_em_asm_signatures.cpp diff --git a/lib/emscripten/emtests/test_em_asm_signatures.out b/lib/emscripten-tests/emtests/test_em_asm_signatures.out similarity index 100% rename from lib/emscripten/emtests/test_em_asm_signatures.out rename to lib/emscripten-tests/emtests/test_em_asm_signatures.out diff --git a/lib/emscripten/emtests/test_em_asm_signatures.wasm b/lib/emscripten-tests/emtests/test_em_asm_signatures.wasm similarity index 100% rename from lib/emscripten/emtests/test_em_asm_signatures.wasm rename to lib/emscripten-tests/emtests/test_em_asm_signatures.wasm diff --git a/lib/emscripten/emtests/test_em_asm_unicode.cpp b/lib/emscripten-tests/emtests/test_em_asm_unicode.cpp similarity index 100% rename from lib/emscripten/emtests/test_em_asm_unicode.cpp rename to lib/emscripten-tests/emtests/test_em_asm_unicode.cpp diff --git a/lib/emscripten/emtests/test_em_asm_unicode.out b/lib/emscripten-tests/emtests/test_em_asm_unicode.out similarity index 100% rename from lib/emscripten/emtests/test_em_asm_unicode.out rename to lib/emscripten-tests/emtests/test_em_asm_unicode.out diff --git a/lib/emscripten/emtests/test_em_asm_unicode.wasm b/lib/emscripten-tests/emtests/test_em_asm_unicode.wasm similarity index 100% rename from lib/emscripten/emtests/test_em_asm_unicode.wasm rename to lib/emscripten-tests/emtests/test_em_asm_unicode.wasm diff --git a/lib/emscripten/emtests/test_em_asm_unused_arguments.cpp b/lib/emscripten-tests/emtests/test_em_asm_unused_arguments.cpp similarity index 100% rename from lib/emscripten/emtests/test_em_asm_unused_arguments.cpp rename to lib/emscripten-tests/emtests/test_em_asm_unused_arguments.cpp diff --git a/lib/emscripten/emtests/test_em_asm_unused_arguments.out b/lib/emscripten-tests/emtests/test_em_asm_unused_arguments.out similarity index 100% rename from lib/emscripten/emtests/test_em_asm_unused_arguments.out rename to lib/emscripten-tests/emtests/test_em_asm_unused_arguments.out diff --git a/lib/emscripten/emtests/test_em_asm_unused_arguments.wasm b/lib/emscripten-tests/emtests/test_em_asm_unused_arguments.wasm similarity index 100% rename from lib/emscripten/emtests/test_em_asm_unused_arguments.wasm rename to lib/emscripten-tests/emtests/test_em_asm_unused_arguments.wasm diff --git a/lib/emscripten/emtests/test_em_js.cpp b/lib/emscripten-tests/emtests/test_em_js.cpp similarity index 100% rename from lib/emscripten/emtests/test_em_js.cpp rename to lib/emscripten-tests/emtests/test_em_js.cpp diff --git a/lib/emscripten/emtests/test_em_js.out b/lib/emscripten-tests/emtests/test_em_js.out similarity index 100% rename from lib/emscripten/emtests/test_em_js.out rename to lib/emscripten-tests/emtests/test_em_js.out diff --git a/lib/emscripten/emtests/test_em_js.wasm b/lib/emscripten-tests/emtests/test_em_js.wasm similarity index 100% rename from lib/emscripten/emtests/test_em_js.wasm rename to lib/emscripten-tests/emtests/test_em_js.wasm diff --git a/lib/emscripten/emtests/test_embind_5.cpp b/lib/emscripten-tests/emtests/test_embind_5.cpp similarity index 100% rename from lib/emscripten/emtests/test_embind_5.cpp rename to lib/emscripten-tests/emtests/test_embind_5.cpp diff --git a/lib/emscripten/emtests/test_embind_5.out b/lib/emscripten-tests/emtests/test_embind_5.out similarity index 100% rename from lib/emscripten/emtests/test_embind_5.out rename to lib/emscripten-tests/emtests/test_embind_5.out diff --git a/lib/emscripten/emtests/test_emmalloc.cpp b/lib/emscripten-tests/emtests/test_emmalloc.cpp similarity index 100% rename from lib/emscripten/emtests/test_emmalloc.cpp rename to lib/emscripten-tests/emtests/test_emmalloc.cpp diff --git a/lib/emscripten/emtests/test_emmalloc.txt b/lib/emscripten-tests/emtests/test_emmalloc.txt similarity index 100% rename from lib/emscripten/emtests/test_emmalloc.txt rename to lib/emscripten-tests/emtests/test_emmalloc.txt diff --git a/lib/emscripten/emtests/test_emptyclass.c b/lib/emscripten-tests/emtests/test_emptyclass.c similarity index 100% rename from lib/emscripten/emtests/test_emptyclass.c rename to lib/emscripten-tests/emtests/test_emptyclass.c diff --git a/lib/emscripten/emtests/test_emptyclass.out b/lib/emscripten-tests/emtests/test_emptyclass.out similarity index 100% rename from lib/emscripten/emtests/test_emptyclass.out rename to lib/emscripten-tests/emtests/test_emptyclass.out diff --git a/lib/emscripten/emtests/test_emscripten_api.cpp b/lib/emscripten-tests/emtests/test_emscripten_api.cpp similarity index 100% rename from lib/emscripten/emtests/test_emscripten_api.cpp rename to lib/emscripten-tests/emtests/test_emscripten_api.cpp diff --git a/lib/emscripten/emtests/test_emscripten_api.out b/lib/emscripten-tests/emtests/test_emscripten_api.out similarity index 100% rename from lib/emscripten/emtests/test_emscripten_api.out rename to lib/emscripten-tests/emtests/test_emscripten_api.out diff --git a/lib/emscripten/emtests/test_emscripten_api.wasm b/lib/emscripten-tests/emtests/test_emscripten_api.wasm similarity index 100% rename from lib/emscripten/emtests/test_emscripten_api.wasm rename to lib/emscripten-tests/emtests/test_emscripten_api.wasm diff --git a/lib/emscripten/emtests/test_emulate_function_pointer_casts.cpp b/lib/emscripten-tests/emtests/test_emulate_function_pointer_casts.cpp similarity index 100% rename from lib/emscripten/emtests/test_emulate_function_pointer_casts.cpp rename to lib/emscripten-tests/emtests/test_emulate_function_pointer_casts.cpp diff --git a/lib/emscripten/emtests/test_emulate_function_pointer_casts.wasm b/lib/emscripten-tests/emtests/test_emulate_function_pointer_casts.wasm similarity index 100% rename from lib/emscripten/emtests/test_emulate_function_pointer_casts.wasm rename to lib/emscripten-tests/emtests/test_emulate_function_pointer_casts.wasm diff --git a/lib/emscripten/emtests/test_erf.c b/lib/emscripten-tests/emtests/test_erf.c similarity index 100% rename from lib/emscripten/emtests/test_erf.c rename to lib/emscripten-tests/emtests/test_erf.c diff --git a/lib/emscripten/emtests/test_erf.out b/lib/emscripten-tests/emtests/test_erf.out similarity index 100% rename from lib/emscripten/emtests/test_erf.out rename to lib/emscripten-tests/emtests/test_erf.out diff --git a/lib/emscripten/emtests/test_erf.wasm b/lib/emscripten-tests/emtests/test_erf.wasm similarity index 100% rename from lib/emscripten/emtests/test_erf.wasm rename to lib/emscripten-tests/emtests/test_erf.wasm diff --git a/lib/emscripten/emtests/test_errar.c b/lib/emscripten-tests/emtests/test_errar.c similarity index 100% rename from lib/emscripten/emtests/test_errar.c rename to lib/emscripten-tests/emtests/test_errar.c diff --git a/lib/emscripten/emtests/test_errar.out b/lib/emscripten-tests/emtests/test_errar.out similarity index 100% rename from lib/emscripten/emtests/test_errar.out rename to lib/emscripten-tests/emtests/test_errar.out diff --git a/lib/emscripten/emtests/test_errar.wasm b/lib/emscripten-tests/emtests/test_errar.wasm similarity index 100% rename from lib/emscripten/emtests/test_errar.wasm rename to lib/emscripten-tests/emtests/test_errar.wasm diff --git a/lib/emscripten/emtests/test_exceptions_2.cpp b/lib/emscripten-tests/emtests/test_exceptions_2.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_2.cpp rename to lib/emscripten-tests/emtests/test_exceptions_2.cpp diff --git a/lib/emscripten/emtests/test_exceptions_2.out b/lib/emscripten-tests/emtests/test_exceptions_2.out similarity index 100% rename from lib/emscripten/emtests/test_exceptions_2.out rename to lib/emscripten-tests/emtests/test_exceptions_2.out diff --git a/lib/emscripten/emtests/test_exceptions_2.wasm b/lib/emscripten-tests/emtests/test_exceptions_2.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_2.wasm rename to lib/emscripten-tests/emtests/test_exceptions_2.wasm diff --git a/lib/emscripten/emtests/test_exceptions_alias.c b/lib/emscripten-tests/emtests/test_exceptions_alias.c similarity index 100% rename from lib/emscripten/emtests/test_exceptions_alias.c rename to lib/emscripten-tests/emtests/test_exceptions_alias.c diff --git a/lib/emscripten/emtests/test_exceptions_alias.out b/lib/emscripten-tests/emtests/test_exceptions_alias.out similarity index 100% rename from lib/emscripten/emtests/test_exceptions_alias.out rename to lib/emscripten-tests/emtests/test_exceptions_alias.out diff --git a/lib/emscripten/emtests/test_exceptions_convert.cpp b/lib/emscripten-tests/emtests/test_exceptions_convert.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_convert.cpp rename to lib/emscripten-tests/emtests/test_exceptions_convert.cpp diff --git a/lib/emscripten/emtests/test_exceptions_convert.txt b/lib/emscripten-tests/emtests/test_exceptions_convert.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_convert.txt rename to lib/emscripten-tests/emtests/test_exceptions_convert.txt diff --git a/lib/emscripten/emtests/test_exceptions_convert.wasm b/lib/emscripten-tests/emtests/test_exceptions_convert.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_convert.wasm rename to lib/emscripten-tests/emtests/test_exceptions_convert.wasm diff --git a/lib/emscripten/emtests/test_exceptions_destroy_virtual.cpp b/lib/emscripten-tests/emtests/test_exceptions_destroy_virtual.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_destroy_virtual.cpp rename to lib/emscripten-tests/emtests/test_exceptions_destroy_virtual.cpp diff --git a/lib/emscripten/emtests/test_exceptions_destroy_virtual.txt b/lib/emscripten-tests/emtests/test_exceptions_destroy_virtual.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_destroy_virtual.txt rename to lib/emscripten-tests/emtests/test_exceptions_destroy_virtual.txt diff --git a/lib/emscripten/emtests/test_exceptions_destroy_virtual.wasm b/lib/emscripten-tests/emtests/test_exceptions_destroy_virtual.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_destroy_virtual.wasm rename to lib/emscripten-tests/emtests/test_exceptions_destroy_virtual.wasm diff --git a/lib/emscripten/emtests/test_exceptions_libcxx.cpp b/lib/emscripten-tests/emtests/test_exceptions_libcxx.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_libcxx.cpp rename to lib/emscripten-tests/emtests/test_exceptions_libcxx.cpp diff --git a/lib/emscripten/emtests/test_exceptions_libcxx.txt b/lib/emscripten-tests/emtests/test_exceptions_libcxx.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_libcxx.txt rename to lib/emscripten-tests/emtests/test_exceptions_libcxx.txt diff --git a/lib/emscripten/emtests/test_exceptions_libcxx.wasm b/lib/emscripten-tests/emtests/test_exceptions_libcxx.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_libcxx.wasm rename to lib/emscripten-tests/emtests/test_exceptions_libcxx.wasm diff --git a/lib/emscripten/emtests/test_exceptions_multi.cpp b/lib/emscripten-tests/emtests/test_exceptions_multi.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_multi.cpp rename to lib/emscripten-tests/emtests/test_exceptions_multi.cpp diff --git a/lib/emscripten/emtests/test_exceptions_multi.out b/lib/emscripten-tests/emtests/test_exceptions_multi.out similarity index 100% rename from lib/emscripten/emtests/test_exceptions_multi.out rename to lib/emscripten-tests/emtests/test_exceptions_multi.out diff --git a/lib/emscripten/emtests/test_exceptions_multi.wasm b/lib/emscripten-tests/emtests/test_exceptions_multi.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_multi.wasm rename to lib/emscripten-tests/emtests/test_exceptions_multi.wasm diff --git a/lib/emscripten/emtests/test_exceptions_multiple_inherit.cpp b/lib/emscripten-tests/emtests/test_exceptions_multiple_inherit.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_multiple_inherit.cpp rename to lib/emscripten-tests/emtests/test_exceptions_multiple_inherit.cpp diff --git a/lib/emscripten/emtests/test_exceptions_multiple_inherit.txt b/lib/emscripten-tests/emtests/test_exceptions_multiple_inherit.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_multiple_inherit.txt rename to lib/emscripten-tests/emtests/test_exceptions_multiple_inherit.txt diff --git a/lib/emscripten/emtests/test_exceptions_multiple_inherit.wasm b/lib/emscripten-tests/emtests/test_exceptions_multiple_inherit.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_multiple_inherit.wasm rename to lib/emscripten-tests/emtests/test_exceptions_multiple_inherit.wasm diff --git a/lib/emscripten/emtests/test_exceptions_multiple_inherit_rethrow.cpp b/lib/emscripten-tests/emtests/test_exceptions_multiple_inherit_rethrow.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_multiple_inherit_rethrow.cpp rename to lib/emscripten-tests/emtests/test_exceptions_multiple_inherit_rethrow.cpp diff --git a/lib/emscripten/emtests/test_exceptions_multiple_inherit_rethrow.txt b/lib/emscripten-tests/emtests/test_exceptions_multiple_inherit_rethrow.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_multiple_inherit_rethrow.txt rename to lib/emscripten-tests/emtests/test_exceptions_multiple_inherit_rethrow.txt diff --git a/lib/emscripten/emtests/test_exceptions_multiple_inherit_rethrow.wasm b/lib/emscripten-tests/emtests/test_exceptions_multiple_inherit_rethrow.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_multiple_inherit_rethrow.wasm rename to lib/emscripten-tests/emtests/test_exceptions_multiple_inherit_rethrow.wasm diff --git a/lib/emscripten/emtests/test_exceptions_primary.cpp b/lib/emscripten-tests/emtests/test_exceptions_primary.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_primary.cpp rename to lib/emscripten-tests/emtests/test_exceptions_primary.cpp diff --git a/lib/emscripten/emtests/test_exceptions_primary.txt b/lib/emscripten-tests/emtests/test_exceptions_primary.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_primary.txt rename to lib/emscripten-tests/emtests/test_exceptions_primary.txt diff --git a/lib/emscripten/emtests/test_exceptions_primary.wasm b/lib/emscripten-tests/emtests/test_exceptions_primary.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_primary.wasm rename to lib/emscripten-tests/emtests/test_exceptions_primary.wasm diff --git a/lib/emscripten/emtests/test_exceptions_refcount.cpp b/lib/emscripten-tests/emtests/test_exceptions_refcount.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_refcount.cpp rename to lib/emscripten-tests/emtests/test_exceptions_refcount.cpp diff --git a/lib/emscripten/emtests/test_exceptions_refcount.txt b/lib/emscripten-tests/emtests/test_exceptions_refcount.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_refcount.txt rename to lib/emscripten-tests/emtests/test_exceptions_refcount.txt diff --git a/lib/emscripten/emtests/test_exceptions_refcount.wasm b/lib/emscripten-tests/emtests/test_exceptions_refcount.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_refcount.wasm rename to lib/emscripten-tests/emtests/test_exceptions_refcount.wasm diff --git a/lib/emscripten/emtests/test_exceptions_resume.cpp b/lib/emscripten-tests/emtests/test_exceptions_resume.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_resume.cpp rename to lib/emscripten-tests/emtests/test_exceptions_resume.cpp diff --git a/lib/emscripten/emtests/test_exceptions_resume.txt b/lib/emscripten-tests/emtests/test_exceptions_resume.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_resume.txt rename to lib/emscripten-tests/emtests/test_exceptions_resume.txt diff --git a/lib/emscripten/emtests/test_exceptions_resume.wasm b/lib/emscripten-tests/emtests/test_exceptions_resume.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_resume.wasm rename to lib/emscripten-tests/emtests/test_exceptions_resume.wasm diff --git a/lib/emscripten/emtests/test_exceptions_rethrow.cpp b/lib/emscripten-tests/emtests/test_exceptions_rethrow.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_rethrow.cpp rename to lib/emscripten-tests/emtests/test_exceptions_rethrow.cpp diff --git a/lib/emscripten/emtests/test_exceptions_rethrow.txt b/lib/emscripten-tests/emtests/test_exceptions_rethrow.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_rethrow.txt rename to lib/emscripten-tests/emtests/test_exceptions_rethrow.txt diff --git a/lib/emscripten/emtests/test_exceptions_rethrow.wasm b/lib/emscripten-tests/emtests/test_exceptions_rethrow.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_rethrow.wasm rename to lib/emscripten-tests/emtests/test_exceptions_rethrow.wasm diff --git a/lib/emscripten/emtests/test_exceptions_simplify_cfg.cpp b/lib/emscripten-tests/emtests/test_exceptions_simplify_cfg.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_simplify_cfg.cpp rename to lib/emscripten-tests/emtests/test_exceptions_simplify_cfg.cpp diff --git a/lib/emscripten/emtests/test_exceptions_simplify_cfg.txt b/lib/emscripten-tests/emtests/test_exceptions_simplify_cfg.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_simplify_cfg.txt rename to lib/emscripten-tests/emtests/test_exceptions_simplify_cfg.txt diff --git a/lib/emscripten/emtests/test_exceptions_simplify_cfg.wasm b/lib/emscripten-tests/emtests/test_exceptions_simplify_cfg.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_simplify_cfg.wasm rename to lib/emscripten-tests/emtests/test_exceptions_simplify_cfg.wasm diff --git a/lib/emscripten/emtests/test_exceptions_std.cpp b/lib/emscripten-tests/emtests/test_exceptions_std.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_std.cpp rename to lib/emscripten-tests/emtests/test_exceptions_std.cpp diff --git a/lib/emscripten/emtests/test_exceptions_std.out b/lib/emscripten-tests/emtests/test_exceptions_std.out similarity index 100% rename from lib/emscripten/emtests/test_exceptions_std.out rename to lib/emscripten-tests/emtests/test_exceptions_std.out diff --git a/lib/emscripten/emtests/test_exceptions_std.wasm b/lib/emscripten-tests/emtests/test_exceptions_std.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_std.wasm rename to lib/emscripten-tests/emtests/test_exceptions_std.wasm diff --git a/lib/emscripten/emtests/test_exceptions_typed.c b/lib/emscripten-tests/emtests/test_exceptions_typed.c similarity index 100% rename from lib/emscripten/emtests/test_exceptions_typed.c rename to lib/emscripten-tests/emtests/test_exceptions_typed.c diff --git a/lib/emscripten/emtests/test_exceptions_typed.out b/lib/emscripten-tests/emtests/test_exceptions_typed.out similarity index 100% rename from lib/emscripten/emtests/test_exceptions_typed.out rename to lib/emscripten-tests/emtests/test_exceptions_typed.out diff --git a/lib/emscripten/emtests/test_exceptions_virtual_inheritance.cpp b/lib/emscripten-tests/emtests/test_exceptions_virtual_inheritance.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_virtual_inheritance.cpp rename to lib/emscripten-tests/emtests/test_exceptions_virtual_inheritance.cpp diff --git a/lib/emscripten/emtests/test_exceptions_virtual_inheritance.txt b/lib/emscripten-tests/emtests/test_exceptions_virtual_inheritance.txt similarity index 100% rename from lib/emscripten/emtests/test_exceptions_virtual_inheritance.txt rename to lib/emscripten-tests/emtests/test_exceptions_virtual_inheritance.txt diff --git a/lib/emscripten/emtests/test_exceptions_virtual_inheritance.wasm b/lib/emscripten-tests/emtests/test_exceptions_virtual_inheritance.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_virtual_inheritance.wasm rename to lib/emscripten-tests/emtests/test_exceptions_virtual_inheritance.wasm diff --git a/lib/emscripten/emtests/test_exceptions_white_list.cpp b/lib/emscripten-tests/emtests/test_exceptions_white_list.cpp similarity index 100% rename from lib/emscripten/emtests/test_exceptions_white_list.cpp rename to lib/emscripten-tests/emtests/test_exceptions_white_list.cpp diff --git a/lib/emscripten/emtests/test_exceptions_white_list.out b/lib/emscripten-tests/emtests/test_exceptions_white_list.out similarity index 100% rename from lib/emscripten/emtests/test_exceptions_white_list.out rename to lib/emscripten-tests/emtests/test_exceptions_white_list.out diff --git a/lib/emscripten/emtests/test_exceptions_white_list.wasm b/lib/emscripten-tests/emtests/test_exceptions_white_list.wasm similarity index 100% rename from lib/emscripten/emtests/test_exceptions_white_list.wasm rename to lib/emscripten-tests/emtests/test_exceptions_white_list.wasm diff --git a/lib/emscripten/emtests/test_exceptions_white_list_2.c b/lib/emscripten-tests/emtests/test_exceptions_white_list_2.c similarity index 100% rename from lib/emscripten/emtests/test_exceptions_white_list_2.c rename to lib/emscripten-tests/emtests/test_exceptions_white_list_2.c diff --git a/lib/emscripten/emtests/test_exceptions_white_list_2.out b/lib/emscripten-tests/emtests/test_exceptions_white_list_2.out similarity index 100% rename from lib/emscripten/emtests/test_exceptions_white_list_2.out rename to lib/emscripten-tests/emtests/test_exceptions_white_list_2.out diff --git a/lib/emscripten/tests/emtests/syscalls.rs b/lib/emscripten-tests/emtests/test_exceptions_white_list_empty.out similarity index 100% rename from lib/emscripten/tests/emtests/syscalls.rs rename to lib/emscripten-tests/emtests/test_exceptions_white_list_empty.out diff --git a/lib/emscripten/emtests/test_execvp.c b/lib/emscripten-tests/emtests/test_execvp.c similarity index 100% rename from lib/emscripten/emtests/test_execvp.c rename to lib/emscripten-tests/emtests/test_execvp.c diff --git a/lib/emscripten/emtests/test_execvp.out b/lib/emscripten-tests/emtests/test_execvp.out similarity index 100% rename from lib/emscripten/emtests/test_execvp.out rename to lib/emscripten-tests/emtests/test_execvp.out diff --git a/lib/emscripten/emtests/test_execvp.wasm b/lib/emscripten-tests/emtests/test_execvp.wasm similarity index 100% rename from lib/emscripten/emtests/test_execvp.wasm rename to lib/emscripten-tests/emtests/test_execvp.wasm diff --git a/lib/emscripten/emtests/test_execvp_windows.c b/lib/emscripten-tests/emtests/test_execvp_windows.c similarity index 100% rename from lib/emscripten/emtests/test_execvp_windows.c rename to lib/emscripten-tests/emtests/test_execvp_windows.c diff --git a/lib/emscripten/emtests/test_execvp_windows.wasm b/lib/emscripten-tests/emtests/test_execvp_windows.wasm similarity index 100% rename from lib/emscripten/emtests/test_execvp_windows.wasm rename to lib/emscripten-tests/emtests/test_execvp_windows.wasm diff --git a/lib/emscripten/emtests/test_fakestat.c b/lib/emscripten-tests/emtests/test_fakestat.c similarity index 100% rename from lib/emscripten/emtests/test_fakestat.c rename to lib/emscripten-tests/emtests/test_fakestat.c diff --git a/lib/emscripten/emtests/test_fakestat.out b/lib/emscripten-tests/emtests/test_fakestat.out similarity index 100% rename from lib/emscripten/emtests/test_fakestat.out rename to lib/emscripten-tests/emtests/test_fakestat.out diff --git a/lib/emscripten/emtests/test_fast_math.c b/lib/emscripten-tests/emtests/test_fast_math.c similarity index 100% rename from lib/emscripten/emtests/test_fast_math.c rename to lib/emscripten-tests/emtests/test_fast_math.c diff --git a/lib/emscripten/emtests/test_fast_math.out b/lib/emscripten-tests/emtests/test_fast_math.out similarity index 100% rename from lib/emscripten/emtests/test_fast_math.out rename to lib/emscripten-tests/emtests/test_fast_math.out diff --git a/lib/emscripten/emtests/test_fast_math.wasm b/lib/emscripten-tests/emtests/test_fast_math.wasm similarity index 100% rename from lib/emscripten/emtests/test_fast_math.wasm rename to lib/emscripten-tests/emtests/test_fast_math.wasm diff --git a/lib/emscripten/emtests/test_fcvt.c b/lib/emscripten-tests/emtests/test_fcvt.c similarity index 100% rename from lib/emscripten/emtests/test_fcvt.c rename to lib/emscripten-tests/emtests/test_fcvt.c diff --git a/lib/emscripten/emtests/test_fcvt.out b/lib/emscripten-tests/emtests/test_fcvt.out similarity index 100% rename from lib/emscripten/emtests/test_fcvt.out rename to lib/emscripten-tests/emtests/test_fcvt.out diff --git a/lib/emscripten/emtests/test_flexarray_struct.c b/lib/emscripten-tests/emtests/test_flexarray_struct.c similarity index 100% rename from lib/emscripten/emtests/test_flexarray_struct.c rename to lib/emscripten-tests/emtests/test_flexarray_struct.c diff --git a/lib/emscripten/emtests/test_flexarray_struct.out b/lib/emscripten-tests/emtests/test_flexarray_struct.out similarity index 100% rename from lib/emscripten/emtests/test_flexarray_struct.out rename to lib/emscripten-tests/emtests/test_flexarray_struct.out diff --git a/lib/emscripten/emtests/test_flexarray_struct.wasm b/lib/emscripten-tests/emtests/test_flexarray_struct.wasm similarity index 100% rename from lib/emscripten/emtests/test_flexarray_struct.wasm rename to lib/emscripten-tests/emtests/test_flexarray_struct.wasm diff --git a/lib/emscripten/emtests/test_float32_precise.c b/lib/emscripten-tests/emtests/test_float32_precise.c similarity index 100% rename from lib/emscripten/emtests/test_float32_precise.c rename to lib/emscripten-tests/emtests/test_float32_precise.c diff --git a/lib/emscripten/emtests/test_float32_precise.out b/lib/emscripten-tests/emtests/test_float32_precise.out similarity index 100% rename from lib/emscripten/emtests/test_float32_precise.out rename to lib/emscripten-tests/emtests/test_float32_precise.out diff --git a/lib/emscripten/emtests/test_float32_precise.wasm b/lib/emscripten-tests/emtests/test_float32_precise.wasm similarity index 100% rename from lib/emscripten/emtests/test_float32_precise.wasm rename to lib/emscripten-tests/emtests/test_float32_precise.wasm diff --git a/lib/emscripten/emtests/test_float_builtins.c b/lib/emscripten-tests/emtests/test_float_builtins.c similarity index 100% rename from lib/emscripten/emtests/test_float_builtins.c rename to lib/emscripten-tests/emtests/test_float_builtins.c diff --git a/lib/emscripten/emtests/test_float_builtins.out b/lib/emscripten-tests/emtests/test_float_builtins.out similarity index 100% rename from lib/emscripten/emtests/test_float_builtins.out rename to lib/emscripten-tests/emtests/test_float_builtins.out diff --git a/lib/emscripten/emtests/test_float_builtins.wasm b/lib/emscripten-tests/emtests/test_float_builtins.wasm similarity index 100% rename from lib/emscripten/emtests/test_float_builtins.wasm rename to lib/emscripten-tests/emtests/test_float_builtins.wasm diff --git a/lib/emscripten/emtests/test_floatvars.c b/lib/emscripten-tests/emtests/test_floatvars.c similarity index 100% rename from lib/emscripten/emtests/test_floatvars.c rename to lib/emscripten-tests/emtests/test_floatvars.c diff --git a/lib/emscripten/emtests/test_floatvars.out b/lib/emscripten-tests/emtests/test_floatvars.out similarity index 100% rename from lib/emscripten/emtests/test_floatvars.out rename to lib/emscripten-tests/emtests/test_floatvars.out diff --git a/lib/emscripten/emtests/test_frexp.c b/lib/emscripten-tests/emtests/test_frexp.c similarity index 100% rename from lib/emscripten/emtests/test_frexp.c rename to lib/emscripten-tests/emtests/test_frexp.c diff --git a/lib/emscripten/emtests/test_frexp.out b/lib/emscripten-tests/emtests/test_frexp.out similarity index 100% rename from lib/emscripten/emtests/test_frexp.out rename to lib/emscripten-tests/emtests/test_frexp.out diff --git a/lib/emscripten/emtests/test_frexp.wasm b/lib/emscripten-tests/emtests/test_frexp.wasm similarity index 100% rename from lib/emscripten/emtests/test_frexp.wasm rename to lib/emscripten-tests/emtests/test_frexp.wasm diff --git a/lib/emscripten/emtests/test_funcptr.c b/lib/emscripten-tests/emtests/test_funcptr.c similarity index 100% rename from lib/emscripten/emtests/test_funcptr.c rename to lib/emscripten-tests/emtests/test_funcptr.c diff --git a/lib/emscripten/emtests/test_funcptr.out b/lib/emscripten-tests/emtests/test_funcptr.out similarity index 100% rename from lib/emscripten/emtests/test_funcptr.out rename to lib/emscripten-tests/emtests/test_funcptr.out diff --git a/lib/emscripten/emtests/test_funcptr.wasm b/lib/emscripten-tests/emtests/test_funcptr.wasm similarity index 100% rename from lib/emscripten/emtests/test_funcptr.wasm rename to lib/emscripten-tests/emtests/test_funcptr.wasm diff --git a/lib/emscripten/emtests/test_funcptr_import_type.cpp b/lib/emscripten-tests/emtests/test_funcptr_import_type.cpp similarity index 100% rename from lib/emscripten/emtests/test_funcptr_import_type.cpp rename to lib/emscripten-tests/emtests/test_funcptr_import_type.cpp diff --git a/lib/emscripten/emtests/test_funcptr_import_type.out b/lib/emscripten-tests/emtests/test_funcptr_import_type.out similarity index 100% rename from lib/emscripten/emtests/test_funcptr_import_type.out rename to lib/emscripten-tests/emtests/test_funcptr_import_type.out diff --git a/lib/emscripten/emtests/test_funcptr_namecollide.c b/lib/emscripten-tests/emtests/test_funcptr_namecollide.c similarity index 100% rename from lib/emscripten/emtests/test_funcptr_namecollide.c rename to lib/emscripten-tests/emtests/test_funcptr_namecollide.c diff --git a/lib/emscripten/emtests/test_funcptr_namecollide.out b/lib/emscripten-tests/emtests/test_funcptr_namecollide.out similarity index 100% rename from lib/emscripten/emtests/test_funcptr_namecollide.out rename to lib/emscripten-tests/emtests/test_funcptr_namecollide.out diff --git a/lib/emscripten/emtests/test_funcptr_namecollide.wasm b/lib/emscripten-tests/emtests/test_funcptr_namecollide.wasm similarity index 100% rename from lib/emscripten/emtests/test_funcptr_namecollide.wasm rename to lib/emscripten-tests/emtests/test_funcptr_namecollide.wasm diff --git a/lib/emscripten/emtests/test_funcptrfunc.c b/lib/emscripten-tests/emtests/test_funcptrfunc.c similarity index 100% rename from lib/emscripten/emtests/test_funcptrfunc.c rename to lib/emscripten-tests/emtests/test_funcptrfunc.c diff --git a/lib/emscripten/emtests/test_funcptrfunc.out b/lib/emscripten-tests/emtests/test_funcptrfunc.out similarity index 100% rename from lib/emscripten/emtests/test_funcptrfunc.out rename to lib/emscripten-tests/emtests/test_funcptrfunc.out diff --git a/lib/emscripten/emtests/test_funcptrfunc.wasm b/lib/emscripten-tests/emtests/test_funcptrfunc.wasm similarity index 100% rename from lib/emscripten/emtests/test_funcptrfunc.wasm rename to lib/emscripten-tests/emtests/test_funcptrfunc.wasm diff --git a/lib/emscripten/emtests/test_funcs.c b/lib/emscripten-tests/emtests/test_funcs.c similarity index 100% rename from lib/emscripten/emtests/test_funcs.c rename to lib/emscripten-tests/emtests/test_funcs.c diff --git a/lib/emscripten/emtests/test_funcs.out b/lib/emscripten-tests/emtests/test_funcs.out similarity index 100% rename from lib/emscripten/emtests/test_funcs.out rename to lib/emscripten-tests/emtests/test_funcs.out diff --git a/lib/emscripten/emtests/test_funcs.wasm b/lib/emscripten-tests/emtests/test_funcs.wasm similarity index 100% rename from lib/emscripten/emtests/test_funcs.wasm rename to lib/emscripten-tests/emtests/test_funcs.wasm diff --git a/lib/emscripten/emtests/test_functionpointer_libfunc_varargs.c b/lib/emscripten-tests/emtests/test_functionpointer_libfunc_varargs.c similarity index 100% rename from lib/emscripten/emtests/test_functionpointer_libfunc_varargs.c rename to lib/emscripten-tests/emtests/test_functionpointer_libfunc_varargs.c diff --git a/lib/emscripten/emtests/test_functionpointer_libfunc_varargs.out b/lib/emscripten-tests/emtests/test_functionpointer_libfunc_varargs.out similarity index 100% rename from lib/emscripten/emtests/test_functionpointer_libfunc_varargs.out rename to lib/emscripten-tests/emtests/test_functionpointer_libfunc_varargs.out diff --git a/lib/emscripten/emtests/test_functionpointer_libfunc_varargs.wasm b/lib/emscripten-tests/emtests/test_functionpointer_libfunc_varargs.wasm similarity index 100% rename from lib/emscripten/emtests/test_functionpointer_libfunc_varargs.wasm rename to lib/emscripten-tests/emtests/test_functionpointer_libfunc_varargs.wasm diff --git a/lib/emscripten/emtests/test_fwrite_0.c b/lib/emscripten-tests/emtests/test_fwrite_0.c similarity index 100% rename from lib/emscripten/emtests/test_fwrite_0.c rename to lib/emscripten-tests/emtests/test_fwrite_0.c diff --git a/lib/emscripten/emtests/test_fwrite_0.out b/lib/emscripten-tests/emtests/test_fwrite_0.out similarity index 100% rename from lib/emscripten/emtests/test_fwrite_0.out rename to lib/emscripten-tests/emtests/test_fwrite_0.out diff --git a/lib/emscripten/emtests/test_fwrite_0.wasm b/lib/emscripten-tests/emtests/test_fwrite_0.wasm similarity index 100% rename from lib/emscripten/emtests/test_fwrite_0.wasm rename to lib/emscripten-tests/emtests/test_fwrite_0.wasm diff --git a/lib/emscripten/emtests/test_getcwd.c b/lib/emscripten-tests/emtests/test_getcwd.c similarity index 100% rename from lib/emscripten/emtests/test_getcwd.c rename to lib/emscripten-tests/emtests/test_getcwd.c diff --git a/lib/emscripten/emtests/test_getcwd.out b/lib/emscripten-tests/emtests/test_getcwd.out similarity index 100% rename from lib/emscripten/emtests/test_getcwd.out rename to lib/emscripten-tests/emtests/test_getcwd.out diff --git a/lib/emscripten/emtests/test_getcwd.wasm b/lib/emscripten-tests/emtests/test_getcwd.wasm similarity index 100% rename from lib/emscripten/emtests/test_getcwd.wasm rename to lib/emscripten-tests/emtests/test_getcwd.wasm diff --git a/lib/emscripten/emtests/test_getgep.c b/lib/emscripten-tests/emtests/test_getgep.c similarity index 100% rename from lib/emscripten/emtests/test_getgep.c rename to lib/emscripten-tests/emtests/test_getgep.c diff --git a/lib/emscripten/emtests/test_getgep.out b/lib/emscripten-tests/emtests/test_getgep.out similarity index 100% rename from lib/emscripten/emtests/test_getgep.out rename to lib/emscripten-tests/emtests/test_getgep.out diff --git a/lib/emscripten/emtests/test_getgep.wasm b/lib/emscripten-tests/emtests/test_getgep.wasm similarity index 100% rename from lib/emscripten/emtests/test_getgep.wasm rename to lib/emscripten-tests/emtests/test_getgep.wasm diff --git a/lib/emscripten/emtests/test_getloadavg.c b/lib/emscripten-tests/emtests/test_getloadavg.c similarity index 100% rename from lib/emscripten/emtests/test_getloadavg.c rename to lib/emscripten-tests/emtests/test_getloadavg.c diff --git a/lib/emscripten/emtests/test_getloadavg.out b/lib/emscripten-tests/emtests/test_getloadavg.out similarity index 100% rename from lib/emscripten/emtests/test_getloadavg.out rename to lib/emscripten-tests/emtests/test_getloadavg.out diff --git a/lib/emscripten/emtests/test_getloadavg.wasm b/lib/emscripten-tests/emtests/test_getloadavg.wasm similarity index 100% rename from lib/emscripten/emtests/test_getloadavg.wasm rename to lib/emscripten-tests/emtests/test_getloadavg.wasm diff --git a/lib/emscripten/emtests/test_getopt.c b/lib/emscripten-tests/emtests/test_getopt.c similarity index 100% rename from lib/emscripten/emtests/test_getopt.c rename to lib/emscripten-tests/emtests/test_getopt.c diff --git a/lib/emscripten/emtests/test_getopt.out b/lib/emscripten-tests/emtests/test_getopt.out similarity index 100% rename from lib/emscripten/emtests/test_getopt.out rename to lib/emscripten-tests/emtests/test_getopt.out diff --git a/lib/emscripten/emtests/test_getopt.wasm b/lib/emscripten-tests/emtests/test_getopt.wasm similarity index 100% rename from lib/emscripten/emtests/test_getopt.wasm rename to lib/emscripten-tests/emtests/test_getopt.wasm diff --git a/lib/emscripten/emtests/test_getopt_long.c b/lib/emscripten-tests/emtests/test_getopt_long.c similarity index 100% rename from lib/emscripten/emtests/test_getopt_long.c rename to lib/emscripten-tests/emtests/test_getopt_long.c diff --git a/lib/emscripten/emtests/test_getopt_long.out b/lib/emscripten-tests/emtests/test_getopt_long.out similarity index 100% rename from lib/emscripten/emtests/test_getopt_long.out rename to lib/emscripten-tests/emtests/test_getopt_long.out diff --git a/lib/emscripten/emtests/test_getopt_long.wasm b/lib/emscripten-tests/emtests/test_getopt_long.wasm similarity index 100% rename from lib/emscripten/emtests/test_getopt_long.wasm rename to lib/emscripten-tests/emtests/test_getopt_long.wasm diff --git a/lib/emscripten/emtests/test_globaldoubles.c b/lib/emscripten-tests/emtests/test_globaldoubles.c similarity index 100% rename from lib/emscripten/emtests/test_globaldoubles.c rename to lib/emscripten-tests/emtests/test_globaldoubles.c diff --git a/lib/emscripten/emtests/test_globaldoubles.out b/lib/emscripten-tests/emtests/test_globaldoubles.out similarity index 100% rename from lib/emscripten/emtests/test_globaldoubles.out rename to lib/emscripten-tests/emtests/test_globaldoubles.out diff --git a/lib/emscripten/emtests/test_globaldoubles.wasm b/lib/emscripten-tests/emtests/test_globaldoubles.wasm similarity index 100% rename from lib/emscripten/emtests/test_globaldoubles.wasm rename to lib/emscripten-tests/emtests/test_globaldoubles.wasm diff --git a/lib/emscripten/emtests/test_globals.c b/lib/emscripten-tests/emtests/test_globals.c similarity index 100% rename from lib/emscripten/emtests/test_globals.c rename to lib/emscripten-tests/emtests/test_globals.c diff --git a/lib/emscripten/emtests/test_globals.out b/lib/emscripten-tests/emtests/test_globals.out similarity index 100% rename from lib/emscripten/emtests/test_globals.out rename to lib/emscripten-tests/emtests/test_globals.out diff --git a/lib/emscripten/emtests/test_globals.wasm b/lib/emscripten-tests/emtests/test_globals.wasm similarity index 100% rename from lib/emscripten/emtests/test_globals.wasm rename to lib/emscripten-tests/emtests/test_globals.wasm diff --git a/lib/emscripten/emtests/test_gmtime.c b/lib/emscripten-tests/emtests/test_gmtime.c similarity index 100% rename from lib/emscripten/emtests/test_gmtime.c rename to lib/emscripten-tests/emtests/test_gmtime.c diff --git a/lib/emscripten/emtests/test_gmtime.out b/lib/emscripten-tests/emtests/test_gmtime.out similarity index 100% rename from lib/emscripten/emtests/test_gmtime.out rename to lib/emscripten-tests/emtests/test_gmtime.out diff --git a/lib/emscripten/emtests/test_gmtime.wasm b/lib/emscripten-tests/emtests/test_gmtime.wasm similarity index 100% rename from lib/emscripten/emtests/test_gmtime.wasm rename to lib/emscripten-tests/emtests/test_gmtime.wasm diff --git a/lib/emscripten/emtests/test_hello_world.c b/lib/emscripten-tests/emtests/test_hello_world.c similarity index 100% rename from lib/emscripten/emtests/test_hello_world.c rename to lib/emscripten-tests/emtests/test_hello_world.c diff --git a/lib/emscripten/emtests/test_hello_world.out b/lib/emscripten-tests/emtests/test_hello_world.out similarity index 100% rename from lib/emscripten/emtests/test_hello_world.out rename to lib/emscripten-tests/emtests/test_hello_world.out diff --git a/lib/emscripten/emtests/test_hello_world.wasm b/lib/emscripten-tests/emtests/test_hello_world.wasm similarity index 100% rename from lib/emscripten/emtests/test_hello_world.wasm rename to lib/emscripten-tests/emtests/test_hello_world.wasm diff --git a/lib/emscripten/emtests/test_i16_emcc_intrinsic.c b/lib/emscripten-tests/emtests/test_i16_emcc_intrinsic.c similarity index 100% rename from lib/emscripten/emtests/test_i16_emcc_intrinsic.c rename to lib/emscripten-tests/emtests/test_i16_emcc_intrinsic.c diff --git a/lib/emscripten/emtests/test_i16_emcc_intrinsic.out b/lib/emscripten-tests/emtests/test_i16_emcc_intrinsic.out similarity index 100% rename from lib/emscripten/emtests/test_i16_emcc_intrinsic.out rename to lib/emscripten-tests/emtests/test_i16_emcc_intrinsic.out diff --git a/lib/emscripten/emtests/test_i16_emcc_intrinsic.wasm b/lib/emscripten-tests/emtests/test_i16_emcc_intrinsic.wasm similarity index 100% rename from lib/emscripten/emtests/test_i16_emcc_intrinsic.wasm rename to lib/emscripten-tests/emtests/test_i16_emcc_intrinsic.wasm diff --git a/lib/emscripten/emtests/test_i32_mul_precise.c b/lib/emscripten-tests/emtests/test_i32_mul_precise.c similarity index 100% rename from lib/emscripten/emtests/test_i32_mul_precise.c rename to lib/emscripten-tests/emtests/test_i32_mul_precise.c diff --git a/lib/emscripten/emtests/test_i32_mul_precise.out b/lib/emscripten-tests/emtests/test_i32_mul_precise.out similarity index 100% rename from lib/emscripten/emtests/test_i32_mul_precise.out rename to lib/emscripten-tests/emtests/test_i32_mul_precise.out diff --git a/lib/emscripten/emtests/test_i32_mul_precise.wasm b/lib/emscripten-tests/emtests/test_i32_mul_precise.wasm similarity index 100% rename from lib/emscripten/emtests/test_i32_mul_precise.wasm rename to lib/emscripten-tests/emtests/test_i32_mul_precise.wasm diff --git a/lib/emscripten/emtests/test_i64.c b/lib/emscripten-tests/emtests/test_i64.c similarity index 100% rename from lib/emscripten/emtests/test_i64.c rename to lib/emscripten-tests/emtests/test_i64.c diff --git a/lib/emscripten/emtests/test_i64.out b/lib/emscripten-tests/emtests/test_i64.out similarity index 100% rename from lib/emscripten/emtests/test_i64.out rename to lib/emscripten-tests/emtests/test_i64.out diff --git a/lib/emscripten/emtests/test_i64.wasm b/lib/emscripten-tests/emtests/test_i64.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64.wasm rename to lib/emscripten-tests/emtests/test_i64.wasm diff --git a/lib/emscripten/emtests/test_i64_2.c b/lib/emscripten-tests/emtests/test_i64_2.c similarity index 100% rename from lib/emscripten/emtests/test_i64_2.c rename to lib/emscripten-tests/emtests/test_i64_2.c diff --git a/lib/emscripten/emtests/test_i64_2.out b/lib/emscripten-tests/emtests/test_i64_2.out similarity index 100% rename from lib/emscripten/emtests/test_i64_2.out rename to lib/emscripten-tests/emtests/test_i64_2.out diff --git a/lib/emscripten/emtests/test_i64_3.c b/lib/emscripten-tests/emtests/test_i64_3.c similarity index 100% rename from lib/emscripten/emtests/test_i64_3.c rename to lib/emscripten-tests/emtests/test_i64_3.c diff --git a/lib/emscripten/emtests/test_i64_3.out b/lib/emscripten-tests/emtests/test_i64_3.out similarity index 100% rename from lib/emscripten/emtests/test_i64_3.out rename to lib/emscripten-tests/emtests/test_i64_3.out diff --git a/lib/emscripten/emtests/test_i64_4.c b/lib/emscripten-tests/emtests/test_i64_4.c similarity index 100% rename from lib/emscripten/emtests/test_i64_4.c rename to lib/emscripten-tests/emtests/test_i64_4.c diff --git a/lib/emscripten/emtests/test_i64_4.out b/lib/emscripten-tests/emtests/test_i64_4.out similarity index 100% rename from lib/emscripten/emtests/test_i64_4.out rename to lib/emscripten-tests/emtests/test_i64_4.out diff --git a/lib/emscripten/emtests/test_i64_4.wasm b/lib/emscripten-tests/emtests/test_i64_4.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_4.wasm rename to lib/emscripten-tests/emtests/test_i64_4.wasm diff --git a/lib/emscripten/emtests/test_i64_7z.c b/lib/emscripten-tests/emtests/test_i64_7z.c similarity index 100% rename from lib/emscripten/emtests/test_i64_7z.c rename to lib/emscripten-tests/emtests/test_i64_7z.c diff --git a/lib/emscripten/emtests/test_i64_7z.out b/lib/emscripten-tests/emtests/test_i64_7z.out similarity index 100% rename from lib/emscripten/emtests/test_i64_7z.out rename to lib/emscripten-tests/emtests/test_i64_7z.out diff --git a/lib/emscripten/emtests/test_i64_7z.wasm b/lib/emscripten-tests/emtests/test_i64_7z.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_7z.wasm rename to lib/emscripten-tests/emtests/test_i64_7z.wasm diff --git a/lib/emscripten/emtests/test_i64_b.c b/lib/emscripten-tests/emtests/test_i64_b.c similarity index 100% rename from lib/emscripten/emtests/test_i64_b.c rename to lib/emscripten-tests/emtests/test_i64_b.c diff --git a/lib/emscripten/emtests/test_i64_b.out b/lib/emscripten-tests/emtests/test_i64_b.out similarity index 100% rename from lib/emscripten/emtests/test_i64_b.out rename to lib/emscripten-tests/emtests/test_i64_b.out diff --git a/lib/emscripten/emtests/test_i64_cmp.c b/lib/emscripten-tests/emtests/test_i64_cmp.c similarity index 100% rename from lib/emscripten/emtests/test_i64_cmp.c rename to lib/emscripten-tests/emtests/test_i64_cmp.c diff --git a/lib/emscripten/emtests/test_i64_cmp.out b/lib/emscripten-tests/emtests/test_i64_cmp.out similarity index 100% rename from lib/emscripten/emtests/test_i64_cmp.out rename to lib/emscripten-tests/emtests/test_i64_cmp.out diff --git a/lib/emscripten/emtests/test_i64_cmp2.c b/lib/emscripten-tests/emtests/test_i64_cmp2.c similarity index 100% rename from lib/emscripten/emtests/test_i64_cmp2.c rename to lib/emscripten-tests/emtests/test_i64_cmp2.c diff --git a/lib/emscripten/emtests/test_i64_cmp2.out b/lib/emscripten-tests/emtests/test_i64_cmp2.out similarity index 100% rename from lib/emscripten/emtests/test_i64_cmp2.out rename to lib/emscripten-tests/emtests/test_i64_cmp2.out diff --git a/lib/emscripten/emtests/test_i64_cmp2.wasm b/lib/emscripten-tests/emtests/test_i64_cmp2.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_cmp2.wasm rename to lib/emscripten-tests/emtests/test_i64_cmp2.wasm diff --git a/lib/emscripten/emtests/test_i64_double.c b/lib/emscripten-tests/emtests/test_i64_double.c similarity index 100% rename from lib/emscripten/emtests/test_i64_double.c rename to lib/emscripten-tests/emtests/test_i64_double.c diff --git a/lib/emscripten/emtests/test_i64_double.out b/lib/emscripten-tests/emtests/test_i64_double.out similarity index 100% rename from lib/emscripten/emtests/test_i64_double.out rename to lib/emscripten-tests/emtests/test_i64_double.out diff --git a/lib/emscripten/emtests/test_i64_i16.c b/lib/emscripten-tests/emtests/test_i64_i16.c similarity index 100% rename from lib/emscripten/emtests/test_i64_i16.c rename to lib/emscripten-tests/emtests/test_i64_i16.c diff --git a/lib/emscripten/emtests/test_i64_i16.out b/lib/emscripten-tests/emtests/test_i64_i16.out similarity index 100% rename from lib/emscripten/emtests/test_i64_i16.out rename to lib/emscripten-tests/emtests/test_i64_i16.out diff --git a/lib/emscripten/emtests/test_i64_i16.wasm b/lib/emscripten-tests/emtests/test_i64_i16.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_i16.wasm rename to lib/emscripten-tests/emtests/test_i64_i16.wasm diff --git a/lib/emscripten/emtests/test_i64_llabs.c b/lib/emscripten-tests/emtests/test_i64_llabs.c similarity index 100% rename from lib/emscripten/emtests/test_i64_llabs.c rename to lib/emscripten-tests/emtests/test_i64_llabs.c diff --git a/lib/emscripten/emtests/test_i64_llabs.out b/lib/emscripten-tests/emtests/test_i64_llabs.out similarity index 100% rename from lib/emscripten/emtests/test_i64_llabs.out rename to lib/emscripten-tests/emtests/test_i64_llabs.out diff --git a/lib/emscripten/emtests/test_i64_llabs.wasm b/lib/emscripten-tests/emtests/test_i64_llabs.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_llabs.wasm rename to lib/emscripten-tests/emtests/test_i64_llabs.wasm diff --git a/lib/emscripten/emtests/test_i64_precise.c b/lib/emscripten-tests/emtests/test_i64_precise.c similarity index 100% rename from lib/emscripten/emtests/test_i64_precise.c rename to lib/emscripten-tests/emtests/test_i64_precise.c diff --git a/lib/emscripten/emtests/test_i64_precise.out b/lib/emscripten-tests/emtests/test_i64_precise.out similarity index 100% rename from lib/emscripten/emtests/test_i64_precise.out rename to lib/emscripten-tests/emtests/test_i64_precise.out diff --git a/lib/emscripten/emtests/test_i64_precise.wasm b/lib/emscripten-tests/emtests/test_i64_precise.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_precise.wasm rename to lib/emscripten-tests/emtests/test_i64_precise.wasm diff --git a/lib/emscripten/emtests/test_i64_precise_needed.c b/lib/emscripten-tests/emtests/test_i64_precise_needed.c similarity index 100% rename from lib/emscripten/emtests/test_i64_precise_needed.c rename to lib/emscripten-tests/emtests/test_i64_precise_needed.c diff --git a/lib/emscripten/emtests/test_i64_precise_needed.out b/lib/emscripten-tests/emtests/test_i64_precise_needed.out similarity index 100% rename from lib/emscripten/emtests/test_i64_precise_needed.out rename to lib/emscripten-tests/emtests/test_i64_precise_needed.out diff --git a/lib/emscripten/emtests/test_i64_precise_needed.wasm b/lib/emscripten-tests/emtests/test_i64_precise_needed.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_precise_needed.wasm rename to lib/emscripten-tests/emtests/test_i64_precise_needed.wasm diff --git a/lib/emscripten/emtests/test_i64_precise_unneeded.c b/lib/emscripten-tests/emtests/test_i64_precise_unneeded.c similarity index 100% rename from lib/emscripten/emtests/test_i64_precise_unneeded.c rename to lib/emscripten-tests/emtests/test_i64_precise_unneeded.c diff --git a/lib/emscripten/emtests/test_i64_precise_unneeded.out b/lib/emscripten-tests/emtests/test_i64_precise_unneeded.out similarity index 100% rename from lib/emscripten/emtests/test_i64_precise_unneeded.out rename to lib/emscripten-tests/emtests/test_i64_precise_unneeded.out diff --git a/lib/emscripten/emtests/test_i64_precise_unneeded.wasm b/lib/emscripten-tests/emtests/test_i64_precise_unneeded.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_precise_unneeded.wasm rename to lib/emscripten-tests/emtests/test_i64_precise_unneeded.wasm diff --git a/lib/emscripten/emtests/test_i64_qdouble.c b/lib/emscripten-tests/emtests/test_i64_qdouble.c similarity index 100% rename from lib/emscripten/emtests/test_i64_qdouble.c rename to lib/emscripten-tests/emtests/test_i64_qdouble.c diff --git a/lib/emscripten/emtests/test_i64_qdouble.out b/lib/emscripten-tests/emtests/test_i64_qdouble.out similarity index 100% rename from lib/emscripten/emtests/test_i64_qdouble.out rename to lib/emscripten-tests/emtests/test_i64_qdouble.out diff --git a/lib/emscripten/emtests/test_i64_qdouble.wasm b/lib/emscripten-tests/emtests/test_i64_qdouble.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_qdouble.wasm rename to lib/emscripten-tests/emtests/test_i64_qdouble.wasm diff --git a/lib/emscripten/emtests/test_i64_umul.c b/lib/emscripten-tests/emtests/test_i64_umul.c similarity index 100% rename from lib/emscripten/emtests/test_i64_umul.c rename to lib/emscripten-tests/emtests/test_i64_umul.c diff --git a/lib/emscripten/emtests/test_i64_umul.out b/lib/emscripten-tests/emtests/test_i64_umul.out similarity index 100% rename from lib/emscripten/emtests/test_i64_umul.out rename to lib/emscripten-tests/emtests/test_i64_umul.out diff --git a/lib/emscripten/emtests/test_i64_umul.wasm b/lib/emscripten-tests/emtests/test_i64_umul.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_umul.wasm rename to lib/emscripten-tests/emtests/test_i64_umul.wasm diff --git a/lib/emscripten/emtests/test_i64_varargs.c b/lib/emscripten-tests/emtests/test_i64_varargs.c similarity index 100% rename from lib/emscripten/emtests/test_i64_varargs.c rename to lib/emscripten-tests/emtests/test_i64_varargs.c diff --git a/lib/emscripten/emtests/test_i64_varargs.out b/lib/emscripten-tests/emtests/test_i64_varargs.out similarity index 100% rename from lib/emscripten/emtests/test_i64_varargs.out rename to lib/emscripten-tests/emtests/test_i64_varargs.out diff --git a/lib/emscripten/emtests/test_i64_varargs.wasm b/lib/emscripten-tests/emtests/test_i64_varargs.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_varargs.wasm rename to lib/emscripten-tests/emtests/test_i64_varargs.wasm diff --git a/lib/emscripten/emtests/test_i64_zextneg.c b/lib/emscripten-tests/emtests/test_i64_zextneg.c similarity index 100% rename from lib/emscripten/emtests/test_i64_zextneg.c rename to lib/emscripten-tests/emtests/test_i64_zextneg.c diff --git a/lib/emscripten/emtests/test_i64_zextneg.out b/lib/emscripten-tests/emtests/test_i64_zextneg.out similarity index 100% rename from lib/emscripten/emtests/test_i64_zextneg.out rename to lib/emscripten-tests/emtests/test_i64_zextneg.out diff --git a/lib/emscripten/emtests/test_i64_zextneg.wasm b/lib/emscripten-tests/emtests/test_i64_zextneg.wasm similarity index 100% rename from lib/emscripten/emtests/test_i64_zextneg.wasm rename to lib/emscripten-tests/emtests/test_i64_zextneg.wasm diff --git a/lib/emscripten/emtests/test_if.c b/lib/emscripten-tests/emtests/test_if.c similarity index 100% rename from lib/emscripten/emtests/test_if.c rename to lib/emscripten-tests/emtests/test_if.c diff --git a/lib/emscripten/emtests/test_if.out b/lib/emscripten-tests/emtests/test_if.out similarity index 100% rename from lib/emscripten/emtests/test_if.out rename to lib/emscripten-tests/emtests/test_if.out diff --git a/lib/emscripten/emtests/test_if.wasm b/lib/emscripten-tests/emtests/test_if.wasm similarity index 100% rename from lib/emscripten/emtests/test_if.wasm rename to lib/emscripten-tests/emtests/test_if.wasm diff --git a/lib/emscripten/emtests/test_if_else.c b/lib/emscripten-tests/emtests/test_if_else.c similarity index 100% rename from lib/emscripten/emtests/test_if_else.c rename to lib/emscripten-tests/emtests/test_if_else.c diff --git a/lib/emscripten/emtests/test_if_else.out b/lib/emscripten-tests/emtests/test_if_else.out similarity index 100% rename from lib/emscripten/emtests/test_if_else.out rename to lib/emscripten-tests/emtests/test_if_else.out diff --git a/lib/emscripten/emtests/test_if_else.wasm b/lib/emscripten-tests/emtests/test_if_else.wasm similarity index 100% rename from lib/emscripten/emtests/test_if_else.wasm rename to lib/emscripten-tests/emtests/test_if_else.wasm diff --git a/lib/emscripten/emtests/test_indirectbr.c b/lib/emscripten-tests/emtests/test_indirectbr.c similarity index 100% rename from lib/emscripten/emtests/test_indirectbr.c rename to lib/emscripten-tests/emtests/test_indirectbr.c diff --git a/lib/emscripten/emtests/test_indirectbr.out b/lib/emscripten-tests/emtests/test_indirectbr.out similarity index 100% rename from lib/emscripten/emtests/test_indirectbr.out rename to lib/emscripten-tests/emtests/test_indirectbr.out diff --git a/lib/emscripten/emtests/test_indirectbr.wasm b/lib/emscripten-tests/emtests/test_indirectbr.wasm similarity index 100% rename from lib/emscripten/emtests/test_indirectbr.wasm rename to lib/emscripten-tests/emtests/test_indirectbr.wasm diff --git a/lib/emscripten/emtests/test_indirectbr_many.c b/lib/emscripten-tests/emtests/test_indirectbr_many.c similarity index 100% rename from lib/emscripten/emtests/test_indirectbr_many.c rename to lib/emscripten-tests/emtests/test_indirectbr_many.c diff --git a/lib/emscripten/emtests/test_indirectbr_many.out b/lib/emscripten-tests/emtests/test_indirectbr_many.out similarity index 100% rename from lib/emscripten/emtests/test_indirectbr_many.out rename to lib/emscripten-tests/emtests/test_indirectbr_many.out diff --git a/lib/emscripten/emtests/test_indirectbr_many.wasm b/lib/emscripten-tests/emtests/test_indirectbr_many.wasm similarity index 100% rename from lib/emscripten/emtests/test_indirectbr_many.wasm rename to lib/emscripten-tests/emtests/test_indirectbr_many.wasm diff --git a/lib/emscripten/emtests/test_inherit.c b/lib/emscripten-tests/emtests/test_inherit.c similarity index 100% rename from lib/emscripten/emtests/test_inherit.c rename to lib/emscripten-tests/emtests/test_inherit.c diff --git a/lib/emscripten/emtests/test_inherit.out b/lib/emscripten-tests/emtests/test_inherit.out similarity index 100% rename from lib/emscripten/emtests/test_inherit.out rename to lib/emscripten-tests/emtests/test_inherit.out diff --git a/lib/emscripten/emtests/test_inlinejs.c b/lib/emscripten-tests/emtests/test_inlinejs.c similarity index 100% rename from lib/emscripten/emtests/test_inlinejs.c rename to lib/emscripten-tests/emtests/test_inlinejs.c diff --git a/lib/emscripten/emtests/test_inlinejs.out b/lib/emscripten-tests/emtests/test_inlinejs.out similarity index 100% rename from lib/emscripten/emtests/test_inlinejs.out rename to lib/emscripten-tests/emtests/test_inlinejs.out diff --git a/lib/emscripten/emtests/test_inlinejs2.c b/lib/emscripten-tests/emtests/test_inlinejs2.c similarity index 100% rename from lib/emscripten/emtests/test_inlinejs2.c rename to lib/emscripten-tests/emtests/test_inlinejs2.c diff --git a/lib/emscripten/emtests/test_inlinejs2.out b/lib/emscripten-tests/emtests/test_inlinejs2.out similarity index 100% rename from lib/emscripten/emtests/test_inlinejs2.out rename to lib/emscripten-tests/emtests/test_inlinejs2.out diff --git a/lib/emscripten/emtests/test_inlinejs3.c b/lib/emscripten-tests/emtests/test_inlinejs3.c similarity index 100% rename from lib/emscripten/emtests/test_inlinejs3.c rename to lib/emscripten-tests/emtests/test_inlinejs3.c diff --git a/lib/emscripten/emtests/test_inlinejs3.out b/lib/emscripten-tests/emtests/test_inlinejs3.out similarity index 100% rename from lib/emscripten/emtests/test_inlinejs3.out rename to lib/emscripten-tests/emtests/test_inlinejs3.out diff --git a/lib/emscripten/emtests/test_intentional_fault.c b/lib/emscripten-tests/emtests/test_intentional_fault.c similarity index 100% rename from lib/emscripten/emtests/test_intentional_fault.c rename to lib/emscripten-tests/emtests/test_intentional_fault.c diff --git a/lib/emscripten/emtests/test_intentional_fault.wasm b/lib/emscripten-tests/emtests/test_intentional_fault.wasm similarity index 100% rename from lib/emscripten/emtests/test_intentional_fault.wasm rename to lib/emscripten-tests/emtests/test_intentional_fault.wasm diff --git a/lib/emscripten/emtests/test_intvars.c b/lib/emscripten-tests/emtests/test_intvars.c similarity index 100% rename from lib/emscripten/emtests/test_intvars.c rename to lib/emscripten-tests/emtests/test_intvars.c diff --git a/lib/emscripten/emtests/test_intvars.out b/lib/emscripten-tests/emtests/test_intvars.out similarity index 100% rename from lib/emscripten/emtests/test_intvars.out rename to lib/emscripten-tests/emtests/test_intvars.out diff --git a/lib/emscripten/emtests/test_isdigit_l.c b/lib/emscripten-tests/emtests/test_isdigit_l.c similarity index 100% rename from lib/emscripten/emtests/test_isdigit_l.c rename to lib/emscripten-tests/emtests/test_isdigit_l.c diff --git a/lib/emscripten/emtests/test_isdigit_l.out b/lib/emscripten-tests/emtests/test_isdigit_l.out similarity index 100% rename from lib/emscripten/emtests/test_isdigit_l.out rename to lib/emscripten-tests/emtests/test_isdigit_l.out diff --git a/lib/emscripten/emtests/test_isnan.c b/lib/emscripten-tests/emtests/test_isnan.c similarity index 100% rename from lib/emscripten/emtests/test_isnan.c rename to lib/emscripten-tests/emtests/test_isnan.c diff --git a/lib/emscripten/emtests/test_isnan.out b/lib/emscripten-tests/emtests/test_isnan.out similarity index 100% rename from lib/emscripten/emtests/test_isnan.out rename to lib/emscripten-tests/emtests/test_isnan.out diff --git a/lib/emscripten/emtests/test_isnan.wasm b/lib/emscripten-tests/emtests/test_isnan.wasm similarity index 100% rename from lib/emscripten/emtests/test_isnan.wasm rename to lib/emscripten-tests/emtests/test_isnan.wasm diff --git a/lib/emscripten/emtests/test_istream.c b/lib/emscripten-tests/emtests/test_istream.c similarity index 100% rename from lib/emscripten/emtests/test_istream.c rename to lib/emscripten-tests/emtests/test_istream.c diff --git a/lib/emscripten/emtests/test_istream.out b/lib/emscripten-tests/emtests/test_istream.out similarity index 100% rename from lib/emscripten/emtests/test_istream.out rename to lib/emscripten-tests/emtests/test_istream.out diff --git a/lib/emscripten/emtests/test_iswdigit.c b/lib/emscripten-tests/emtests/test_iswdigit.c similarity index 100% rename from lib/emscripten/emtests/test_iswdigit.c rename to lib/emscripten-tests/emtests/test_iswdigit.c diff --git a/lib/emscripten/emtests/test_iswdigit.out b/lib/emscripten-tests/emtests/test_iswdigit.out similarity index 100% rename from lib/emscripten/emtests/test_iswdigit.out rename to lib/emscripten-tests/emtests/test_iswdigit.out diff --git a/lib/emscripten/emtests/test_libcextra.c b/lib/emscripten-tests/emtests/test_libcextra.c similarity index 100% rename from lib/emscripten/emtests/test_libcextra.c rename to lib/emscripten-tests/emtests/test_libcextra.c diff --git a/lib/emscripten/emtests/test_libcextra.out b/lib/emscripten-tests/emtests/test_libcextra.out similarity index 100% rename from lib/emscripten/emtests/test_libcextra.out rename to lib/emscripten-tests/emtests/test_libcextra.out diff --git a/lib/emscripten/emtests/test_libcextra.wasm b/lib/emscripten-tests/emtests/test_libcextra.wasm similarity index 100% rename from lib/emscripten/emtests/test_libcextra.wasm rename to lib/emscripten-tests/emtests/test_libcextra.wasm diff --git a/lib/emscripten/emtests/test_libgen.c b/lib/emscripten-tests/emtests/test_libgen.c similarity index 100% rename from lib/emscripten/emtests/test_libgen.c rename to lib/emscripten-tests/emtests/test_libgen.c diff --git a/lib/emscripten/emtests/test_libgen.out b/lib/emscripten-tests/emtests/test_libgen.out similarity index 100% rename from lib/emscripten/emtests/test_libgen.out rename to lib/emscripten-tests/emtests/test_libgen.out diff --git a/lib/emscripten/emtests/test_libgen.wasm b/lib/emscripten-tests/emtests/test_libgen.wasm similarity index 100% rename from lib/emscripten/emtests/test_libgen.wasm rename to lib/emscripten-tests/emtests/test_libgen.wasm diff --git a/lib/emscripten/emtests/test_linked_list.c b/lib/emscripten-tests/emtests/test_linked_list.c similarity index 100% rename from lib/emscripten/emtests/test_linked_list.c rename to lib/emscripten-tests/emtests/test_linked_list.c diff --git a/lib/emscripten/emtests/test_linked_list.out b/lib/emscripten-tests/emtests/test_linked_list.out similarity index 100% rename from lib/emscripten/emtests/test_linked_list.out rename to lib/emscripten-tests/emtests/test_linked_list.out diff --git a/lib/emscripten/emtests/test_literal_negative_zero.c b/lib/emscripten-tests/emtests/test_literal_negative_zero.c similarity index 100% rename from lib/emscripten/emtests/test_literal_negative_zero.c rename to lib/emscripten-tests/emtests/test_literal_negative_zero.c diff --git a/lib/emscripten/emtests/test_literal_negative_zero.out b/lib/emscripten-tests/emtests/test_literal_negative_zero.out similarity index 100% rename from lib/emscripten/emtests/test_literal_negative_zero.out rename to lib/emscripten-tests/emtests/test_literal_negative_zero.out diff --git a/lib/emscripten/emtests/test_literal_negative_zero.wasm b/lib/emscripten-tests/emtests/test_literal_negative_zero.wasm similarity index 100% rename from lib/emscripten/emtests/test_literal_negative_zero.wasm rename to lib/emscripten-tests/emtests/test_literal_negative_zero.wasm diff --git a/lib/emscripten/emtests/test_llrint.c b/lib/emscripten-tests/emtests/test_llrint.c similarity index 100% rename from lib/emscripten/emtests/test_llrint.c rename to lib/emscripten-tests/emtests/test_llrint.c diff --git a/lib/emscripten/emtests/test_llrint.out b/lib/emscripten-tests/emtests/test_llrint.out similarity index 100% rename from lib/emscripten/emtests/test_llrint.out rename to lib/emscripten-tests/emtests/test_llrint.out diff --git a/lib/emscripten/emtests/test_llrint.wasm b/lib/emscripten-tests/emtests/test_llrint.wasm similarity index 100% rename from lib/emscripten/emtests/test_llrint.wasm rename to lib/emscripten-tests/emtests/test_llrint.wasm diff --git a/lib/emscripten/emtests/test_llvm_fabs.c b/lib/emscripten-tests/emtests/test_llvm_fabs.c similarity index 100% rename from lib/emscripten/emtests/test_llvm_fabs.c rename to lib/emscripten-tests/emtests/test_llvm_fabs.c diff --git a/lib/emscripten/emtests/test_llvm_fabs.out b/lib/emscripten-tests/emtests/test_llvm_fabs.out similarity index 100% rename from lib/emscripten/emtests/test_llvm_fabs.out rename to lib/emscripten-tests/emtests/test_llvm_fabs.out diff --git a/lib/emscripten/emtests/test_llvm_fabs.wasm b/lib/emscripten-tests/emtests/test_llvm_fabs.wasm similarity index 100% rename from lib/emscripten/emtests/test_llvm_fabs.wasm rename to lib/emscripten-tests/emtests/test_llvm_fabs.wasm diff --git a/lib/emscripten/emtests/test_llvm_intrinsics.cpp b/lib/emscripten-tests/emtests/test_llvm_intrinsics.cpp similarity index 100% rename from lib/emscripten/emtests/test_llvm_intrinsics.cpp rename to lib/emscripten-tests/emtests/test_llvm_intrinsics.cpp diff --git a/lib/emscripten/emtests/test_llvm_intrinsics.out b/lib/emscripten-tests/emtests/test_llvm_intrinsics.out similarity index 100% rename from lib/emscripten/emtests/test_llvm_intrinsics.out rename to lib/emscripten-tests/emtests/test_llvm_intrinsics.out diff --git a/lib/emscripten/emtests/test_llvm_intrinsics.wasm b/lib/emscripten-tests/emtests/test_llvm_intrinsics.wasm similarity index 100% rename from lib/emscripten/emtests/test_llvm_intrinsics.wasm rename to lib/emscripten-tests/emtests/test_llvm_intrinsics.wasm diff --git a/lib/emscripten/emtests/test_llvm_used.c b/lib/emscripten-tests/emtests/test_llvm_used.c similarity index 100% rename from lib/emscripten/emtests/test_llvm_used.c rename to lib/emscripten-tests/emtests/test_llvm_used.c diff --git a/lib/emscripten/emtests/test_llvm_used.out b/lib/emscripten-tests/emtests/test_llvm_used.out similarity index 100% rename from lib/emscripten/emtests/test_llvm_used.out rename to lib/emscripten-tests/emtests/test_llvm_used.out diff --git a/lib/emscripten/emtests/test_llvmswitch.c b/lib/emscripten-tests/emtests/test_llvmswitch.c similarity index 100% rename from lib/emscripten/emtests/test_llvmswitch.c rename to lib/emscripten-tests/emtests/test_llvmswitch.c diff --git a/lib/emscripten/emtests/test_llvmswitch.out b/lib/emscripten-tests/emtests/test_llvmswitch.out similarity index 100% rename from lib/emscripten/emtests/test_llvmswitch.out rename to lib/emscripten-tests/emtests/test_llvmswitch.out diff --git a/lib/emscripten/emtests/test_llvmswitch.wasm b/lib/emscripten-tests/emtests/test_llvmswitch.wasm similarity index 100% rename from lib/emscripten/emtests/test_llvmswitch.wasm rename to lib/emscripten-tests/emtests/test_llvmswitch.wasm diff --git a/lib/emscripten/emtests/test_longjmp.c b/lib/emscripten-tests/emtests/test_longjmp.c similarity index 100% rename from lib/emscripten/emtests/test_longjmp.c rename to lib/emscripten-tests/emtests/test_longjmp.c diff --git a/lib/emscripten/emtests/test_longjmp.out b/lib/emscripten-tests/emtests/test_longjmp.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp.out rename to lib/emscripten-tests/emtests/test_longjmp.out diff --git a/lib/emscripten/emtests/test_longjmp.wasm b/lib/emscripten-tests/emtests/test_longjmp.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp.wasm rename to lib/emscripten-tests/emtests/test_longjmp.wasm diff --git a/lib/emscripten/emtests/test_longjmp2.c b/lib/emscripten-tests/emtests/test_longjmp2.c similarity index 100% rename from lib/emscripten/emtests/test_longjmp2.c rename to lib/emscripten-tests/emtests/test_longjmp2.c diff --git a/lib/emscripten/emtests/test_longjmp2.out b/lib/emscripten-tests/emtests/test_longjmp2.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp2.out rename to lib/emscripten-tests/emtests/test_longjmp2.out diff --git a/lib/emscripten/emtests/test_longjmp2.wasm b/lib/emscripten-tests/emtests/test_longjmp2.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp2.wasm rename to lib/emscripten-tests/emtests/test_longjmp2.wasm diff --git a/lib/emscripten/emtests/test_longjmp3.c b/lib/emscripten-tests/emtests/test_longjmp3.c similarity index 100% rename from lib/emscripten/emtests/test_longjmp3.c rename to lib/emscripten-tests/emtests/test_longjmp3.c diff --git a/lib/emscripten/emtests/test_longjmp3.out b/lib/emscripten-tests/emtests/test_longjmp3.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp3.out rename to lib/emscripten-tests/emtests/test_longjmp3.out diff --git a/lib/emscripten/emtests/test_longjmp3.wasm b/lib/emscripten-tests/emtests/test_longjmp3.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp3.wasm rename to lib/emscripten-tests/emtests/test_longjmp3.wasm diff --git a/lib/emscripten/emtests/test_longjmp4.c b/lib/emscripten-tests/emtests/test_longjmp4.c similarity index 100% rename from lib/emscripten/emtests/test_longjmp4.c rename to lib/emscripten-tests/emtests/test_longjmp4.c diff --git a/lib/emscripten/emtests/test_longjmp4.out b/lib/emscripten-tests/emtests/test_longjmp4.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp4.out rename to lib/emscripten-tests/emtests/test_longjmp4.out diff --git a/lib/emscripten/emtests/test_longjmp4.wasm b/lib/emscripten-tests/emtests/test_longjmp4.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp4.wasm rename to lib/emscripten-tests/emtests/test_longjmp4.wasm diff --git a/lib/emscripten/emtests/test_longjmp_exc.c b/lib/emscripten-tests/emtests/test_longjmp_exc.c similarity index 100% rename from lib/emscripten/emtests/test_longjmp_exc.c rename to lib/emscripten-tests/emtests/test_longjmp_exc.c diff --git a/lib/emscripten/emtests/test_longjmp_exc.out b/lib/emscripten-tests/emtests/test_longjmp_exc.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp_exc.out rename to lib/emscripten-tests/emtests/test_longjmp_exc.out diff --git a/lib/emscripten/emtests/test_longjmp_exc.wasm b/lib/emscripten-tests/emtests/test_longjmp_exc.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp_exc.wasm rename to lib/emscripten-tests/emtests/test_longjmp_exc.wasm diff --git a/lib/emscripten/emtests/test_longjmp_funcptr.c b/lib/emscripten-tests/emtests/test_longjmp_funcptr.c similarity index 100% rename from lib/emscripten/emtests/test_longjmp_funcptr.c rename to lib/emscripten-tests/emtests/test_longjmp_funcptr.c diff --git a/lib/emscripten/emtests/test_longjmp_funcptr.out b/lib/emscripten-tests/emtests/test_longjmp_funcptr.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp_funcptr.out rename to lib/emscripten-tests/emtests/test_longjmp_funcptr.out diff --git a/lib/emscripten/emtests/test_longjmp_funcptr.wasm b/lib/emscripten-tests/emtests/test_longjmp_funcptr.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp_funcptr.wasm rename to lib/emscripten-tests/emtests/test_longjmp_funcptr.wasm diff --git a/lib/emscripten/emtests/test_longjmp_repeat.c b/lib/emscripten-tests/emtests/test_longjmp_repeat.c similarity index 100% rename from lib/emscripten/emtests/test_longjmp_repeat.c rename to lib/emscripten-tests/emtests/test_longjmp_repeat.c diff --git a/lib/emscripten/emtests/test_longjmp_repeat.out b/lib/emscripten-tests/emtests/test_longjmp_repeat.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp_repeat.out rename to lib/emscripten-tests/emtests/test_longjmp_repeat.out diff --git a/lib/emscripten/emtests/test_longjmp_repeat.wasm b/lib/emscripten-tests/emtests/test_longjmp_repeat.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp_repeat.wasm rename to lib/emscripten-tests/emtests/test_longjmp_repeat.wasm diff --git a/lib/emscripten/emtests/test_longjmp_stacked.c b/lib/emscripten-tests/emtests/test_longjmp_stacked.c similarity index 100% rename from lib/emscripten/emtests/test_longjmp_stacked.c rename to lib/emscripten-tests/emtests/test_longjmp_stacked.c diff --git a/lib/emscripten/emtests/test_longjmp_stacked.out b/lib/emscripten-tests/emtests/test_longjmp_stacked.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp_stacked.out rename to lib/emscripten-tests/emtests/test_longjmp_stacked.out diff --git a/lib/emscripten/emtests/test_longjmp_stacked.wasm b/lib/emscripten-tests/emtests/test_longjmp_stacked.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp_stacked.wasm rename to lib/emscripten-tests/emtests/test_longjmp_stacked.wasm diff --git a/lib/emscripten/emtests/test_longjmp_throw.cpp b/lib/emscripten-tests/emtests/test_longjmp_throw.cpp similarity index 100% rename from lib/emscripten/emtests/test_longjmp_throw.cpp rename to lib/emscripten-tests/emtests/test_longjmp_throw.cpp diff --git a/lib/emscripten/emtests/test_longjmp_throw.out b/lib/emscripten-tests/emtests/test_longjmp_throw.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp_throw.out rename to lib/emscripten-tests/emtests/test_longjmp_throw.out diff --git a/lib/emscripten/emtests/test_longjmp_throw.wasm b/lib/emscripten-tests/emtests/test_longjmp_throw.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp_throw.wasm rename to lib/emscripten-tests/emtests/test_longjmp_throw.wasm diff --git a/lib/emscripten/emtests/test_longjmp_unwind.c b/lib/emscripten-tests/emtests/test_longjmp_unwind.c similarity index 100% rename from lib/emscripten/emtests/test_longjmp_unwind.c rename to lib/emscripten-tests/emtests/test_longjmp_unwind.c diff --git a/lib/emscripten/emtests/test_longjmp_unwind.out b/lib/emscripten-tests/emtests/test_longjmp_unwind.out similarity index 100% rename from lib/emscripten/emtests/test_longjmp_unwind.out rename to lib/emscripten-tests/emtests/test_longjmp_unwind.out diff --git a/lib/emscripten/emtests/test_longjmp_unwind.wasm b/lib/emscripten-tests/emtests/test_longjmp_unwind.wasm similarity index 100% rename from lib/emscripten/emtests/test_longjmp_unwind.wasm rename to lib/emscripten-tests/emtests/test_longjmp_unwind.wasm diff --git a/lib/emscripten/emtests/test_loop.c b/lib/emscripten-tests/emtests/test_loop.c similarity index 100% rename from lib/emscripten/emtests/test_loop.c rename to lib/emscripten-tests/emtests/test_loop.c diff --git a/lib/emscripten/emtests/test_loop.out b/lib/emscripten-tests/emtests/test_loop.out similarity index 100% rename from lib/emscripten/emtests/test_loop.out rename to lib/emscripten-tests/emtests/test_loop.out diff --git a/lib/emscripten/emtests/test_loop.wasm b/lib/emscripten-tests/emtests/test_loop.wasm similarity index 100% rename from lib/emscripten/emtests/test_loop.wasm rename to lib/emscripten-tests/emtests/test_loop.wasm diff --git a/lib/emscripten/emtests/test_lower_intrinsics.c b/lib/emscripten-tests/emtests/test_lower_intrinsics.c similarity index 100% rename from lib/emscripten/emtests/test_lower_intrinsics.c rename to lib/emscripten-tests/emtests/test_lower_intrinsics.c diff --git a/lib/emscripten/emtests/test_lower_intrinsics.out b/lib/emscripten-tests/emtests/test_lower_intrinsics.out similarity index 100% rename from lib/emscripten/emtests/test_lower_intrinsics.out rename to lib/emscripten-tests/emtests/test_lower_intrinsics.out diff --git a/lib/emscripten/emtests/test_lower_intrinsics.wasm b/lib/emscripten-tests/emtests/test_lower_intrinsics.wasm similarity index 100% rename from lib/emscripten/emtests/test_lower_intrinsics.wasm rename to lib/emscripten-tests/emtests/test_lower_intrinsics.wasm diff --git a/lib/emscripten/emtests/test_main_module_static_align.cpp b/lib/emscripten-tests/emtests/test_main_module_static_align.cpp similarity index 100% rename from lib/emscripten/emtests/test_main_module_static_align.cpp rename to lib/emscripten-tests/emtests/test_main_module_static_align.cpp diff --git a/lib/emscripten/emtests/test_main_module_static_align.txt b/lib/emscripten-tests/emtests/test_main_module_static_align.txt similarity index 100% rename from lib/emscripten/emtests/test_main_module_static_align.txt rename to lib/emscripten-tests/emtests/test_main_module_static_align.txt diff --git a/lib/emscripten/emtests/test_main_module_static_align.wasm b/lib/emscripten-tests/emtests/test_main_module_static_align.wasm similarity index 100% rename from lib/emscripten/emtests/test_main_module_static_align.wasm rename to lib/emscripten-tests/emtests/test_main_module_static_align.wasm diff --git a/lib/emscripten/emtests/test_main_thread_async_em_asm.cpp b/lib/emscripten-tests/emtests/test_main_thread_async_em_asm.cpp similarity index 100% rename from lib/emscripten/emtests/test_main_thread_async_em_asm.cpp rename to lib/emscripten-tests/emtests/test_main_thread_async_em_asm.cpp diff --git a/lib/emscripten/emtests/test_main_thread_async_em_asm.out b/lib/emscripten-tests/emtests/test_main_thread_async_em_asm.out similarity index 100% rename from lib/emscripten/emtests/test_main_thread_async_em_asm.out rename to lib/emscripten-tests/emtests/test_main_thread_async_em_asm.out diff --git a/lib/emscripten/emtests/test_main_thread_async_em_asm.wasm b/lib/emscripten-tests/emtests/test_main_thread_async_em_asm.wasm similarity index 100% rename from lib/emscripten/emtests/test_main_thread_async_em_asm.wasm rename to lib/emscripten-tests/emtests/test_main_thread_async_em_asm.wasm diff --git a/lib/emscripten/emtests/test_mainenv.c b/lib/emscripten-tests/emtests/test_mainenv.c similarity index 100% rename from lib/emscripten/emtests/test_mainenv.c rename to lib/emscripten-tests/emtests/test_mainenv.c diff --git a/lib/emscripten/emtests/test_mainenv.out b/lib/emscripten-tests/emtests/test_mainenv.out similarity index 100% rename from lib/emscripten/emtests/test_mainenv.out rename to lib/emscripten-tests/emtests/test_mainenv.out diff --git a/lib/emscripten/emtests/test_mainenv.wasm b/lib/emscripten-tests/emtests/test_mainenv.wasm similarity index 100% rename from lib/emscripten/emtests/test_mainenv.wasm rename to lib/emscripten-tests/emtests/test_mainenv.wasm diff --git a/lib/emscripten/emtests/test_math.c b/lib/emscripten-tests/emtests/test_math.c similarity index 100% rename from lib/emscripten/emtests/test_math.c rename to lib/emscripten-tests/emtests/test_math.c diff --git a/lib/emscripten/emtests/test_math.out b/lib/emscripten-tests/emtests/test_math.out similarity index 100% rename from lib/emscripten/emtests/test_math.out rename to lib/emscripten-tests/emtests/test_math.out diff --git a/lib/emscripten/emtests/test_mathfuncptr.c b/lib/emscripten-tests/emtests/test_mathfuncptr.c similarity index 100% rename from lib/emscripten/emtests/test_mathfuncptr.c rename to lib/emscripten-tests/emtests/test_mathfuncptr.c diff --git a/lib/emscripten/emtests/test_mathfuncptr.out b/lib/emscripten-tests/emtests/test_mathfuncptr.out similarity index 100% rename from lib/emscripten/emtests/test_mathfuncptr.out rename to lib/emscripten-tests/emtests/test_mathfuncptr.out diff --git a/lib/emscripten/emtests/test_mathfuncptr.wasm b/lib/emscripten-tests/emtests/test_mathfuncptr.wasm similarity index 100% rename from lib/emscripten/emtests/test_mathfuncptr.wasm rename to lib/emscripten-tests/emtests/test_mathfuncptr.wasm diff --git a/lib/emscripten/emtests/test_memcpy2.c b/lib/emscripten-tests/emtests/test_memcpy2.c similarity index 100% rename from lib/emscripten/emtests/test_memcpy2.c rename to lib/emscripten-tests/emtests/test_memcpy2.c diff --git a/lib/emscripten/emtests/test_memcpy2.out b/lib/emscripten-tests/emtests/test_memcpy2.out similarity index 100% rename from lib/emscripten/emtests/test_memcpy2.out rename to lib/emscripten-tests/emtests/test_memcpy2.out diff --git a/lib/emscripten/emtests/test_memcpy2.wasm b/lib/emscripten-tests/emtests/test_memcpy2.wasm similarity index 100% rename from lib/emscripten/emtests/test_memcpy2.wasm rename to lib/emscripten-tests/emtests/test_memcpy2.wasm diff --git a/lib/emscripten/emtests/test_memcpy3.c b/lib/emscripten-tests/emtests/test_memcpy3.c similarity index 100% rename from lib/emscripten/emtests/test_memcpy3.c rename to lib/emscripten-tests/emtests/test_memcpy3.c diff --git a/lib/emscripten/emtests/test_memcpy3.out b/lib/emscripten-tests/emtests/test_memcpy3.out similarity index 100% rename from lib/emscripten/emtests/test_memcpy3.out rename to lib/emscripten-tests/emtests/test_memcpy3.out diff --git a/lib/emscripten/emtests/test_memcpy3.wasm b/lib/emscripten-tests/emtests/test_memcpy3.wasm similarity index 100% rename from lib/emscripten/emtests/test_memcpy3.wasm rename to lib/emscripten-tests/emtests/test_memcpy3.wasm diff --git a/lib/emscripten/emtests/test_memcpy_memcmp.c b/lib/emscripten-tests/emtests/test_memcpy_memcmp.c similarity index 100% rename from lib/emscripten/emtests/test_memcpy_memcmp.c rename to lib/emscripten-tests/emtests/test_memcpy_memcmp.c diff --git a/lib/emscripten/emtests/test_memcpy_memcmp.out b/lib/emscripten-tests/emtests/test_memcpy_memcmp.out similarity index 100% rename from lib/emscripten/emtests/test_memcpy_memcmp.out rename to lib/emscripten-tests/emtests/test_memcpy_memcmp.out diff --git a/lib/emscripten/emtests/test_memcpy_memcmp.wasm b/lib/emscripten-tests/emtests/test_memcpy_memcmp.wasm similarity index 100% rename from lib/emscripten/emtests/test_memcpy_memcmp.wasm rename to lib/emscripten-tests/emtests/test_memcpy_memcmp.wasm diff --git a/lib/emscripten/emtests/test_memmove.c b/lib/emscripten-tests/emtests/test_memmove.c similarity index 100% rename from lib/emscripten/emtests/test_memmove.c rename to lib/emscripten-tests/emtests/test_memmove.c diff --git a/lib/emscripten/emtests/test_memmove.out b/lib/emscripten-tests/emtests/test_memmove.out similarity index 100% rename from lib/emscripten/emtests/test_memmove.out rename to lib/emscripten-tests/emtests/test_memmove.out diff --git a/lib/emscripten/emtests/test_memmove.wasm b/lib/emscripten-tests/emtests/test_memmove.wasm similarity index 100% rename from lib/emscripten/emtests/test_memmove.wasm rename to lib/emscripten-tests/emtests/test_memmove.wasm diff --git a/lib/emscripten/emtests/test_memmove2.c b/lib/emscripten-tests/emtests/test_memmove2.c similarity index 100% rename from lib/emscripten/emtests/test_memmove2.c rename to lib/emscripten-tests/emtests/test_memmove2.c diff --git a/lib/emscripten/emtests/test_memmove2.out b/lib/emscripten-tests/emtests/test_memmove2.out similarity index 100% rename from lib/emscripten/emtests/test_memmove2.out rename to lib/emscripten-tests/emtests/test_memmove2.out diff --git a/lib/emscripten/emtests/test_memmove2.wasm b/lib/emscripten-tests/emtests/test_memmove2.wasm similarity index 100% rename from lib/emscripten/emtests/test_memmove2.wasm rename to lib/emscripten-tests/emtests/test_memmove2.wasm diff --git a/lib/emscripten/emtests/test_memmove3.c b/lib/emscripten-tests/emtests/test_memmove3.c similarity index 100% rename from lib/emscripten/emtests/test_memmove3.c rename to lib/emscripten-tests/emtests/test_memmove3.c diff --git a/lib/emscripten/emtests/test_memmove3.out b/lib/emscripten-tests/emtests/test_memmove3.out similarity index 100% rename from lib/emscripten/emtests/test_memmove3.out rename to lib/emscripten-tests/emtests/test_memmove3.out diff --git a/lib/emscripten/emtests/test_memmove3.wasm b/lib/emscripten-tests/emtests/test_memmove3.wasm similarity index 100% rename from lib/emscripten/emtests/test_memmove3.wasm rename to lib/emscripten-tests/emtests/test_memmove3.wasm diff --git a/lib/emscripten/emtests/test_memorygrowth.c b/lib/emscripten-tests/emtests/test_memorygrowth.c similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth.c rename to lib/emscripten-tests/emtests/test_memorygrowth.c diff --git a/lib/emscripten/emtests/test_memorygrowth.wasm b/lib/emscripten-tests/emtests/test_memorygrowth.wasm similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth.wasm rename to lib/emscripten-tests/emtests/test_memorygrowth.wasm diff --git a/lib/emscripten/emtests/test_memorygrowth_2.c b/lib/emscripten-tests/emtests/test_memorygrowth_2.c similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth_2.c rename to lib/emscripten-tests/emtests/test_memorygrowth_2.c diff --git a/lib/emscripten/emtests/test_memorygrowth_2.wasm b/lib/emscripten-tests/emtests/test_memorygrowth_2.wasm similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth_2.wasm rename to lib/emscripten-tests/emtests/test_memorygrowth_2.wasm diff --git a/lib/emscripten/emtests/test_memorygrowth_3.c b/lib/emscripten-tests/emtests/test_memorygrowth_3.c similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth_3.c rename to lib/emscripten-tests/emtests/test_memorygrowth_3.c diff --git a/lib/emscripten/emtests/test_memorygrowth_3.txt b/lib/emscripten-tests/emtests/test_memorygrowth_3.txt similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth_3.txt rename to lib/emscripten-tests/emtests/test_memorygrowth_3.txt diff --git a/lib/emscripten/emtests/test_memorygrowth_3.wasm b/lib/emscripten-tests/emtests/test_memorygrowth_3.wasm similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth_3.wasm rename to lib/emscripten-tests/emtests/test_memorygrowth_3.wasm diff --git a/lib/emscripten/emtests/test_memorygrowth_wasm_mem_max.c b/lib/emscripten-tests/emtests/test_memorygrowth_wasm_mem_max.c similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth_wasm_mem_max.c rename to lib/emscripten-tests/emtests/test_memorygrowth_wasm_mem_max.c diff --git a/lib/emscripten/emtests/test_memorygrowth_wasm_mem_max.txt b/lib/emscripten-tests/emtests/test_memorygrowth_wasm_mem_max.txt similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth_wasm_mem_max.txt rename to lib/emscripten-tests/emtests/test_memorygrowth_wasm_mem_max.txt diff --git a/lib/emscripten/emtests/test_memorygrowth_wasm_mem_max.wasm b/lib/emscripten-tests/emtests/test_memorygrowth_wasm_mem_max.wasm similarity index 100% rename from lib/emscripten/emtests/test_memorygrowth_wasm_mem_max.wasm rename to lib/emscripten-tests/emtests/test_memorygrowth_wasm_mem_max.wasm diff --git a/lib/emscripten/emtests/test_memset.c b/lib/emscripten-tests/emtests/test_memset.c similarity index 100% rename from lib/emscripten/emtests/test_memset.c rename to lib/emscripten-tests/emtests/test_memset.c diff --git a/lib/emscripten/emtests/test_memset.out b/lib/emscripten-tests/emtests/test_memset.out similarity index 100% rename from lib/emscripten/emtests/test_memset.out rename to lib/emscripten-tests/emtests/test_memset.out diff --git a/lib/emscripten/emtests/test_memset.wasm b/lib/emscripten-tests/emtests/test_memset.wasm similarity index 100% rename from lib/emscripten/emtests/test_memset.wasm rename to lib/emscripten-tests/emtests/test_memset.wasm diff --git a/lib/emscripten/emtests/test_mmap.c b/lib/emscripten-tests/emtests/test_mmap.c similarity index 100% rename from lib/emscripten/emtests/test_mmap.c rename to lib/emscripten-tests/emtests/test_mmap.c diff --git a/lib/emscripten/emtests/test_mmap.out b/lib/emscripten-tests/emtests/test_mmap.out similarity index 100% rename from lib/emscripten/emtests/test_mmap.out rename to lib/emscripten-tests/emtests/test_mmap.out diff --git a/lib/emscripten/emtests/test_mmap.wasm b/lib/emscripten-tests/emtests/test_mmap.wasm similarity index 100% rename from lib/emscripten/emtests/test_mmap.wasm rename to lib/emscripten-tests/emtests/test_mmap.wasm diff --git a/lib/emscripten/emtests/test_mod_globalstruct.c b/lib/emscripten-tests/emtests/test_mod_globalstruct.c similarity index 100% rename from lib/emscripten/emtests/test_mod_globalstruct.c rename to lib/emscripten-tests/emtests/test_mod_globalstruct.c diff --git a/lib/emscripten/emtests/test_mod_globalstruct.out b/lib/emscripten-tests/emtests/test_mod_globalstruct.out similarity index 100% rename from lib/emscripten/emtests/test_mod_globalstruct.out rename to lib/emscripten-tests/emtests/test_mod_globalstruct.out diff --git a/lib/emscripten/emtests/test_negative_zero.c b/lib/emscripten-tests/emtests/test_negative_zero.c similarity index 100% rename from lib/emscripten/emtests/test_negative_zero.c rename to lib/emscripten-tests/emtests/test_negative_zero.c diff --git a/lib/emscripten/emtests/test_negative_zero.out b/lib/emscripten-tests/emtests/test_negative_zero.out similarity index 100% rename from lib/emscripten/emtests/test_negative_zero.out rename to lib/emscripten-tests/emtests/test_negative_zero.out diff --git a/lib/emscripten/emtests/test_negative_zero.wasm b/lib/emscripten-tests/emtests/test_negative_zero.wasm similarity index 100% rename from lib/emscripten/emtests/test_negative_zero.wasm rename to lib/emscripten-tests/emtests/test_negative_zero.wasm diff --git a/lib/emscripten/emtests/test_nested_struct_varargs.c b/lib/emscripten-tests/emtests/test_nested_struct_varargs.c similarity index 100% rename from lib/emscripten/emtests/test_nested_struct_varargs.c rename to lib/emscripten-tests/emtests/test_nested_struct_varargs.c diff --git a/lib/emscripten/emtests/test_nested_struct_varargs.out b/lib/emscripten-tests/emtests/test_nested_struct_varargs.out similarity index 100% rename from lib/emscripten/emtests/test_nested_struct_varargs.out rename to lib/emscripten-tests/emtests/test_nested_struct_varargs.out diff --git a/lib/emscripten/emtests/test_nested_struct_varargs.wasm b/lib/emscripten-tests/emtests/test_nested_struct_varargs.wasm similarity index 100% rename from lib/emscripten/emtests/test_nested_struct_varargs.wasm rename to lib/emscripten-tests/emtests/test_nested_struct_varargs.wasm diff --git a/lib/emscripten/emtests/test_nl_types.c b/lib/emscripten-tests/emtests/test_nl_types.c similarity index 100% rename from lib/emscripten/emtests/test_nl_types.c rename to lib/emscripten-tests/emtests/test_nl_types.c diff --git a/lib/emscripten/emtests/test_nl_types.out b/lib/emscripten-tests/emtests/test_nl_types.out similarity index 100% rename from lib/emscripten/emtests/test_nl_types.out rename to lib/emscripten-tests/emtests/test_nl_types.out diff --git a/lib/emscripten/emtests/test_nl_types.wasm b/lib/emscripten-tests/emtests/test_nl_types.wasm similarity index 100% rename from lib/emscripten/emtests/test_nl_types.wasm rename to lib/emscripten-tests/emtests/test_nl_types.wasm diff --git a/lib/emscripten/emtests/test_perrar.c b/lib/emscripten-tests/emtests/test_perrar.c similarity index 100% rename from lib/emscripten/emtests/test_perrar.c rename to lib/emscripten-tests/emtests/test_perrar.c diff --git a/lib/emscripten/emtests/test_perrar.out b/lib/emscripten-tests/emtests/test_perrar.out similarity index 100% rename from lib/emscripten/emtests/test_perrar.out rename to lib/emscripten-tests/emtests/test_perrar.out diff --git a/lib/emscripten/emtests/test_perrar.wasm b/lib/emscripten-tests/emtests/test_perrar.wasm similarity index 100% rename from lib/emscripten/emtests/test_perrar.wasm rename to lib/emscripten-tests/emtests/test_perrar.wasm diff --git a/lib/emscripten/emtests/test_phiundef.c b/lib/emscripten-tests/emtests/test_phiundef.c similarity index 100% rename from lib/emscripten/emtests/test_phiundef.c rename to lib/emscripten-tests/emtests/test_phiundef.c diff --git a/lib/emscripten/emtests/test_phiundef.out b/lib/emscripten-tests/emtests/test_phiundef.out similarity index 100% rename from lib/emscripten/emtests/test_phiundef.out rename to lib/emscripten-tests/emtests/test_phiundef.out diff --git a/lib/emscripten/emtests/test_phiundef.wasm b/lib/emscripten-tests/emtests/test_phiundef.wasm similarity index 100% rename from lib/emscripten/emtests/test_phiundef.wasm rename to lib/emscripten-tests/emtests/test_phiundef.wasm diff --git a/lib/emscripten/emtests/test_pipe.c b/lib/emscripten-tests/emtests/test_pipe.c similarity index 100% rename from lib/emscripten/emtests/test_pipe.c rename to lib/emscripten-tests/emtests/test_pipe.c diff --git a/lib/emscripten/emtests/test_pipe.out b/lib/emscripten-tests/emtests/test_pipe.out similarity index 100% rename from lib/emscripten/emtests/test_pipe.out rename to lib/emscripten-tests/emtests/test_pipe.out diff --git a/lib/emscripten/emtests/test_pipe.wasm b/lib/emscripten-tests/emtests/test_pipe.wasm similarity index 100% rename from lib/emscripten/emtests/test_pipe.wasm rename to lib/emscripten-tests/emtests/test_pipe.wasm diff --git a/lib/emscripten/emtests/test_poll.c b/lib/emscripten-tests/emtests/test_poll.c similarity index 100% rename from lib/emscripten/emtests/test_poll.c rename to lib/emscripten-tests/emtests/test_poll.c diff --git a/lib/emscripten/emtests/test_poll.out b/lib/emscripten-tests/emtests/test_poll.out similarity index 100% rename from lib/emscripten/emtests/test_poll.out rename to lib/emscripten-tests/emtests/test_poll.out diff --git a/lib/emscripten/emtests/test_poll.wasm b/lib/emscripten-tests/emtests/test_poll.wasm similarity index 100% rename from lib/emscripten/emtests/test_poll.wasm rename to lib/emscripten-tests/emtests/test_poll.wasm diff --git a/lib/emscripten/emtests/test_polymorph.c b/lib/emscripten-tests/emtests/test_polymorph.c similarity index 100% rename from lib/emscripten/emtests/test_polymorph.c rename to lib/emscripten-tests/emtests/test_polymorph.c diff --git a/lib/emscripten/emtests/test_polymorph.out b/lib/emscripten-tests/emtests/test_polymorph.out similarity index 100% rename from lib/emscripten/emtests/test_polymorph.out rename to lib/emscripten-tests/emtests/test_polymorph.out diff --git a/lib/emscripten/emtests/test_posixtime.c b/lib/emscripten-tests/emtests/test_posixtime.c similarity index 100% rename from lib/emscripten/emtests/test_posixtime.c rename to lib/emscripten-tests/emtests/test_posixtime.c diff --git a/lib/emscripten/emtests/test_posixtime.out b/lib/emscripten-tests/emtests/test_posixtime.out similarity index 100% rename from lib/emscripten/emtests/test_posixtime.out rename to lib/emscripten-tests/emtests/test_posixtime.out diff --git a/lib/emscripten/emtests/test_posixtime.wasm b/lib/emscripten-tests/emtests/test_posixtime.wasm similarity index 100% rename from lib/emscripten/emtests/test_posixtime.wasm rename to lib/emscripten-tests/emtests/test_posixtime.wasm diff --git a/lib/emscripten/emtests/test_posixtime_no_monotonic.out b/lib/emscripten-tests/emtests/test_posixtime_no_monotonic.out similarity index 100% rename from lib/emscripten/emtests/test_posixtime_no_monotonic.out rename to lib/emscripten-tests/emtests/test_posixtime_no_monotonic.out diff --git a/lib/emscripten/emtests/test_printf_2.c b/lib/emscripten-tests/emtests/test_printf_2.c similarity index 100% rename from lib/emscripten/emtests/test_printf_2.c rename to lib/emscripten-tests/emtests/test_printf_2.c diff --git a/lib/emscripten/emtests/test_printf_2.out b/lib/emscripten-tests/emtests/test_printf_2.out similarity index 100% rename from lib/emscripten/emtests/test_printf_2.out rename to lib/emscripten-tests/emtests/test_printf_2.out diff --git a/lib/emscripten/emtests/test_printf_2.wasm b/lib/emscripten-tests/emtests/test_printf_2.wasm similarity index 100% rename from lib/emscripten/emtests/test_printf_2.wasm rename to lib/emscripten-tests/emtests/test_printf_2.wasm diff --git a/lib/emscripten/emtests/test_printf_more.c b/lib/emscripten-tests/emtests/test_printf_more.c similarity index 100% rename from lib/emscripten/emtests/test_printf_more.c rename to lib/emscripten-tests/emtests/test_printf_more.c diff --git a/lib/emscripten/emtests/test_printf_more.out b/lib/emscripten-tests/emtests/test_printf_more.out similarity index 100% rename from lib/emscripten/emtests/test_printf_more.out rename to lib/emscripten-tests/emtests/test_printf_more.out diff --git a/lib/emscripten/emtests/test_printf_more.wasm b/lib/emscripten-tests/emtests/test_printf_more.wasm similarity index 100% rename from lib/emscripten/emtests/test_printf_more.wasm rename to lib/emscripten-tests/emtests/test_printf_more.wasm diff --git a/lib/emscripten/emtests/test_ptrtoint.out b/lib/emscripten-tests/emtests/test_ptrtoint.out similarity index 100% rename from lib/emscripten/emtests/test_ptrtoint.out rename to lib/emscripten-tests/emtests/test_ptrtoint.out diff --git a/lib/emscripten/emtests/test_random_device.cpp b/lib/emscripten-tests/emtests/test_random_device.cpp similarity index 100% rename from lib/emscripten/emtests/test_random_device.cpp rename to lib/emscripten-tests/emtests/test_random_device.cpp diff --git a/lib/emscripten/emtests/test_random_device.txt b/lib/emscripten-tests/emtests/test_random_device.txt similarity index 100% rename from lib/emscripten/emtests/test_random_device.txt rename to lib/emscripten-tests/emtests/test_random_device.txt diff --git a/lib/emscripten/emtests/test_regex.c b/lib/emscripten-tests/emtests/test_regex.c similarity index 100% rename from lib/emscripten/emtests/test_regex.c rename to lib/emscripten-tests/emtests/test_regex.c diff --git a/lib/emscripten/emtests/test_regex.out b/lib/emscripten-tests/emtests/test_regex.out similarity index 100% rename from lib/emscripten/emtests/test_regex.out rename to lib/emscripten-tests/emtests/test_regex.out diff --git a/lib/emscripten/emtests/test_regex.wasm b/lib/emscripten-tests/emtests/test_regex.wasm similarity index 100% rename from lib/emscripten/emtests/test_regex.wasm rename to lib/emscripten-tests/emtests/test_regex.wasm diff --git a/lib/emscripten/emtests/test_reinterpreted_ptrs.c b/lib/emscripten-tests/emtests/test_reinterpreted_ptrs.c similarity index 100% rename from lib/emscripten/emtests/test_reinterpreted_ptrs.c rename to lib/emscripten-tests/emtests/test_reinterpreted_ptrs.c diff --git a/lib/emscripten/emtests/test_reinterpreted_ptrs.out b/lib/emscripten-tests/emtests/test_reinterpreted_ptrs.out similarity index 100% rename from lib/emscripten/emtests/test_reinterpreted_ptrs.out rename to lib/emscripten-tests/emtests/test_reinterpreted_ptrs.out diff --git a/lib/emscripten/emtests/test_relocatable_void_function.c b/lib/emscripten-tests/emtests/test_relocatable_void_function.c similarity index 100% rename from lib/emscripten/emtests/test_relocatable_void_function.c rename to lib/emscripten-tests/emtests/test_relocatable_void_function.c diff --git a/lib/emscripten/emtests/test_relocatable_void_function.out b/lib/emscripten-tests/emtests/test_relocatable_void_function.out similarity index 100% rename from lib/emscripten/emtests/test_relocatable_void_function.out rename to lib/emscripten-tests/emtests/test_relocatable_void_function.out diff --git a/lib/emscripten/emtests/test_relocatable_void_function.wasm b/lib/emscripten-tests/emtests/test_relocatable_void_function.wasm similarity index 100% rename from lib/emscripten/emtests/test_relocatable_void_function.wasm rename to lib/emscripten-tests/emtests/test_relocatable_void_function.wasm diff --git a/lib/emscripten/emtests/test_rounding.c b/lib/emscripten-tests/emtests/test_rounding.c similarity index 100% rename from lib/emscripten/emtests/test_rounding.c rename to lib/emscripten-tests/emtests/test_rounding.c diff --git a/lib/emscripten/emtests/test_rounding.out b/lib/emscripten-tests/emtests/test_rounding.out similarity index 100% rename from lib/emscripten/emtests/test_rounding.out rename to lib/emscripten-tests/emtests/test_rounding.out diff --git a/lib/emscripten/emtests/test_rounding.wasm b/lib/emscripten-tests/emtests/test_rounding.wasm similarity index 100% rename from lib/emscripten/emtests/test_rounding.wasm rename to lib/emscripten-tests/emtests/test_rounding.wasm diff --git a/lib/emscripten/emtests/test_runtime_stacksave.c b/lib/emscripten-tests/emtests/test_runtime_stacksave.c similarity index 100% rename from lib/emscripten/emtests/test_runtime_stacksave.c rename to lib/emscripten-tests/emtests/test_runtime_stacksave.c diff --git a/lib/emscripten/emtests/test_runtime_stacksave.wasm b/lib/emscripten-tests/emtests/test_runtime_stacksave.wasm similarity index 100% rename from lib/emscripten/emtests/test_runtime_stacksave.wasm rename to lib/emscripten-tests/emtests/test_runtime_stacksave.wasm diff --git a/lib/emscripten/emtests/test_set_align.c b/lib/emscripten-tests/emtests/test_set_align.c similarity index 100% rename from lib/emscripten/emtests/test_set_align.c rename to lib/emscripten-tests/emtests/test_set_align.c diff --git a/lib/emscripten/emtests/test_set_align.out b/lib/emscripten-tests/emtests/test_set_align.out similarity index 100% rename from lib/emscripten/emtests/test_set_align.out rename to lib/emscripten-tests/emtests/test_set_align.out diff --git a/lib/emscripten/emtests/test_set_align.wasm b/lib/emscripten-tests/emtests/test_set_align.wasm similarity index 100% rename from lib/emscripten/emtests/test_set_align.wasm rename to lib/emscripten-tests/emtests/test_set_align.wasm diff --git a/lib/emscripten/emtests/test_siglongjmp.c b/lib/emscripten-tests/emtests/test_siglongjmp.c similarity index 100% rename from lib/emscripten/emtests/test_siglongjmp.c rename to lib/emscripten-tests/emtests/test_siglongjmp.c diff --git a/lib/emscripten/emtests/test_siglongjmp.out b/lib/emscripten-tests/emtests/test_siglongjmp.out similarity index 100% rename from lib/emscripten/emtests/test_siglongjmp.out rename to lib/emscripten-tests/emtests/test_siglongjmp.out diff --git a/lib/emscripten/emtests/test_siglongjmp.wasm b/lib/emscripten-tests/emtests/test_siglongjmp.wasm similarity index 100% rename from lib/emscripten/emtests/test_siglongjmp.wasm rename to lib/emscripten-tests/emtests/test_siglongjmp.wasm diff --git a/lib/emscripten/emtests/test_simd.c b/lib/emscripten-tests/emtests/test_simd.c similarity index 100% rename from lib/emscripten/emtests/test_simd.c rename to lib/emscripten-tests/emtests/test_simd.c diff --git a/lib/emscripten/emtests/test_simd.out b/lib/emscripten-tests/emtests/test_simd.out similarity index 100% rename from lib/emscripten/emtests/test_simd.out rename to lib/emscripten-tests/emtests/test_simd.out diff --git a/lib/emscripten/emtests/test_simd10.c b/lib/emscripten-tests/emtests/test_simd10.c similarity index 100% rename from lib/emscripten/emtests/test_simd10.c rename to lib/emscripten-tests/emtests/test_simd10.c diff --git a/lib/emscripten/emtests/test_simd10.out b/lib/emscripten-tests/emtests/test_simd10.out similarity index 100% rename from lib/emscripten/emtests/test_simd10.out rename to lib/emscripten-tests/emtests/test_simd10.out diff --git a/lib/emscripten/emtests/test_simd11.c b/lib/emscripten-tests/emtests/test_simd11.c similarity index 100% rename from lib/emscripten/emtests/test_simd11.c rename to lib/emscripten-tests/emtests/test_simd11.c diff --git a/lib/emscripten/emtests/test_simd11.out b/lib/emscripten-tests/emtests/test_simd11.out similarity index 100% rename from lib/emscripten/emtests/test_simd11.out rename to lib/emscripten-tests/emtests/test_simd11.out diff --git a/lib/emscripten/emtests/test_simd12.c b/lib/emscripten-tests/emtests/test_simd12.c similarity index 100% rename from lib/emscripten/emtests/test_simd12.c rename to lib/emscripten-tests/emtests/test_simd12.c diff --git a/lib/emscripten/emtests/test_simd12.out b/lib/emscripten-tests/emtests/test_simd12.out similarity index 100% rename from lib/emscripten/emtests/test_simd12.out rename to lib/emscripten-tests/emtests/test_simd12.out diff --git a/lib/emscripten/emtests/test_simd13.c b/lib/emscripten-tests/emtests/test_simd13.c similarity index 100% rename from lib/emscripten/emtests/test_simd13.c rename to lib/emscripten-tests/emtests/test_simd13.c diff --git a/lib/emscripten/emtests/test_simd13.out b/lib/emscripten-tests/emtests/test_simd13.out similarity index 100% rename from lib/emscripten/emtests/test_simd13.out rename to lib/emscripten-tests/emtests/test_simd13.out diff --git a/lib/emscripten/emtests/test_simd14.c b/lib/emscripten-tests/emtests/test_simd14.c similarity index 100% rename from lib/emscripten/emtests/test_simd14.c rename to lib/emscripten-tests/emtests/test_simd14.c diff --git a/lib/emscripten/emtests/test_simd14.out b/lib/emscripten-tests/emtests/test_simd14.out similarity index 100% rename from lib/emscripten/emtests/test_simd14.out rename to lib/emscripten-tests/emtests/test_simd14.out diff --git a/lib/emscripten/emtests/test_simd15.c b/lib/emscripten-tests/emtests/test_simd15.c similarity index 100% rename from lib/emscripten/emtests/test_simd15.c rename to lib/emscripten-tests/emtests/test_simd15.c diff --git a/lib/emscripten/emtests/test_simd15.out b/lib/emscripten-tests/emtests/test_simd15.out similarity index 100% rename from lib/emscripten/emtests/test_simd15.out rename to lib/emscripten-tests/emtests/test_simd15.out diff --git a/lib/emscripten/emtests/test_simd16.c b/lib/emscripten-tests/emtests/test_simd16.c similarity index 100% rename from lib/emscripten/emtests/test_simd16.c rename to lib/emscripten-tests/emtests/test_simd16.c diff --git a/lib/emscripten/emtests/test_simd16.out b/lib/emscripten-tests/emtests/test_simd16.out similarity index 100% rename from lib/emscripten/emtests/test_simd16.out rename to lib/emscripten-tests/emtests/test_simd16.out diff --git a/lib/emscripten/emtests/test_simd2.c b/lib/emscripten-tests/emtests/test_simd2.c similarity index 100% rename from lib/emscripten/emtests/test_simd2.c rename to lib/emscripten-tests/emtests/test_simd2.c diff --git a/lib/emscripten/emtests/test_simd2.out b/lib/emscripten-tests/emtests/test_simd2.out similarity index 100% rename from lib/emscripten/emtests/test_simd2.out rename to lib/emscripten-tests/emtests/test_simd2.out diff --git a/lib/emscripten/emtests/test_simd3.c b/lib/emscripten-tests/emtests/test_simd3.c similarity index 100% rename from lib/emscripten/emtests/test_simd3.c rename to lib/emscripten-tests/emtests/test_simd3.c diff --git a/lib/emscripten/emtests/test_simd3.out b/lib/emscripten-tests/emtests/test_simd3.out similarity index 100% rename from lib/emscripten/emtests/test_simd3.out rename to lib/emscripten-tests/emtests/test_simd3.out diff --git a/lib/emscripten/emtests/test_simd4.c b/lib/emscripten-tests/emtests/test_simd4.c similarity index 100% rename from lib/emscripten/emtests/test_simd4.c rename to lib/emscripten-tests/emtests/test_simd4.c diff --git a/lib/emscripten/emtests/test_simd4.out b/lib/emscripten-tests/emtests/test_simd4.out similarity index 100% rename from lib/emscripten/emtests/test_simd4.out rename to lib/emscripten-tests/emtests/test_simd4.out diff --git a/lib/emscripten/emtests/test_simd5.c b/lib/emscripten-tests/emtests/test_simd5.c similarity index 100% rename from lib/emscripten/emtests/test_simd5.c rename to lib/emscripten-tests/emtests/test_simd5.c diff --git a/lib/emscripten/emtests/test_simd5.out b/lib/emscripten-tests/emtests/test_simd5.out similarity index 100% rename from lib/emscripten/emtests/test_simd5.out rename to lib/emscripten-tests/emtests/test_simd5.out diff --git a/lib/emscripten/emtests/test_simd6.c b/lib/emscripten-tests/emtests/test_simd6.c similarity index 100% rename from lib/emscripten/emtests/test_simd6.c rename to lib/emscripten-tests/emtests/test_simd6.c diff --git a/lib/emscripten/emtests/test_simd6.out b/lib/emscripten-tests/emtests/test_simd6.out similarity index 100% rename from lib/emscripten/emtests/test_simd6.out rename to lib/emscripten-tests/emtests/test_simd6.out diff --git a/lib/emscripten/emtests/test_simd7.c b/lib/emscripten-tests/emtests/test_simd7.c similarity index 100% rename from lib/emscripten/emtests/test_simd7.c rename to lib/emscripten-tests/emtests/test_simd7.c diff --git a/lib/emscripten/emtests/test_simd7.out b/lib/emscripten-tests/emtests/test_simd7.out similarity index 100% rename from lib/emscripten/emtests/test_simd7.out rename to lib/emscripten-tests/emtests/test_simd7.out diff --git a/lib/emscripten/emtests/test_simd8.c b/lib/emscripten-tests/emtests/test_simd8.c similarity index 100% rename from lib/emscripten/emtests/test_simd8.c rename to lib/emscripten-tests/emtests/test_simd8.c diff --git a/lib/emscripten/emtests/test_simd8.out b/lib/emscripten-tests/emtests/test_simd8.out similarity index 100% rename from lib/emscripten/emtests/test_simd8.out rename to lib/emscripten-tests/emtests/test_simd8.out diff --git a/lib/emscripten/emtests/test_simd9.c b/lib/emscripten-tests/emtests/test_simd9.c similarity index 100% rename from lib/emscripten/emtests/test_simd9.c rename to lib/emscripten-tests/emtests/test_simd9.c diff --git a/lib/emscripten/emtests/test_simd9.out b/lib/emscripten-tests/emtests/test_simd9.out similarity index 100% rename from lib/emscripten/emtests/test_simd9.out rename to lib/emscripten-tests/emtests/test_simd9.out diff --git a/lib/emscripten/emtests/test_simd_dyncall.cpp b/lib/emscripten-tests/emtests/test_simd_dyncall.cpp similarity index 100% rename from lib/emscripten/emtests/test_simd_dyncall.cpp rename to lib/emscripten-tests/emtests/test_simd_dyncall.cpp diff --git a/lib/emscripten/emtests/test_simd_dyncall.txt b/lib/emscripten-tests/emtests/test_simd_dyncall.txt similarity index 100% rename from lib/emscripten/emtests/test_simd_dyncall.txt rename to lib/emscripten-tests/emtests/test_simd_dyncall.txt diff --git a/lib/emscripten/emtests/test_simd_float32x4.c b/lib/emscripten-tests/emtests/test_simd_float32x4.c similarity index 100% rename from lib/emscripten/emtests/test_simd_float32x4.c rename to lib/emscripten-tests/emtests/test_simd_float32x4.c diff --git a/lib/emscripten/emtests/test_simd_float32x4.out b/lib/emscripten-tests/emtests/test_simd_float32x4.out similarity index 100% rename from lib/emscripten/emtests/test_simd_float32x4.out rename to lib/emscripten-tests/emtests/test_simd_float32x4.out diff --git a/lib/emscripten/emtests/test_simd_float64x2.c b/lib/emscripten-tests/emtests/test_simd_float64x2.c similarity index 100% rename from lib/emscripten/emtests/test_simd_float64x2.c rename to lib/emscripten-tests/emtests/test_simd_float64x2.c diff --git a/lib/emscripten/emtests/test_simd_float64x2.out b/lib/emscripten-tests/emtests/test_simd_float64x2.out similarity index 100% rename from lib/emscripten/emtests/test_simd_float64x2.out rename to lib/emscripten-tests/emtests/test_simd_float64x2.out diff --git a/lib/emscripten/emtests/test_simd_int16x8.c b/lib/emscripten-tests/emtests/test_simd_int16x8.c similarity index 100% rename from lib/emscripten/emtests/test_simd_int16x8.c rename to lib/emscripten-tests/emtests/test_simd_int16x8.c diff --git a/lib/emscripten/emtests/test_simd_int16x8.out b/lib/emscripten-tests/emtests/test_simd_int16x8.out similarity index 100% rename from lib/emscripten/emtests/test_simd_int16x8.out rename to lib/emscripten-tests/emtests/test_simd_int16x8.out diff --git a/lib/emscripten/emtests/test_simd_int32x4.c b/lib/emscripten-tests/emtests/test_simd_int32x4.c similarity index 100% rename from lib/emscripten/emtests/test_simd_int32x4.c rename to lib/emscripten-tests/emtests/test_simd_int32x4.c diff --git a/lib/emscripten/emtests/test_simd_int32x4.out b/lib/emscripten-tests/emtests/test_simd_int32x4.out similarity index 100% rename from lib/emscripten/emtests/test_simd_int32x4.out rename to lib/emscripten-tests/emtests/test_simd_int32x4.out diff --git a/lib/emscripten/emtests/test_simd_int8x16.c b/lib/emscripten-tests/emtests/test_simd_int8x16.c similarity index 100% rename from lib/emscripten/emtests/test_simd_int8x16.c rename to lib/emscripten-tests/emtests/test_simd_int8x16.c diff --git a/lib/emscripten/emtests/test_simd_int8x16.out b/lib/emscripten-tests/emtests/test_simd_int8x16.out similarity index 100% rename from lib/emscripten/emtests/test_simd_int8x16.out rename to lib/emscripten-tests/emtests/test_simd_int8x16.out diff --git a/lib/emscripten/emtests/test_simd_set_epi64x.c b/lib/emscripten-tests/emtests/test_simd_set_epi64x.c similarity index 100% rename from lib/emscripten/emtests/test_simd_set_epi64x.c rename to lib/emscripten-tests/emtests/test_simd_set_epi64x.c diff --git a/lib/emscripten/emtests/test_simd_set_epi64x.out b/lib/emscripten-tests/emtests/test_simd_set_epi64x.out similarity index 100% rename from lib/emscripten/emtests/test_simd_set_epi64x.out rename to lib/emscripten-tests/emtests/test_simd_set_epi64x.out diff --git a/lib/emscripten/emtests/test_simd_shift_right.c b/lib/emscripten-tests/emtests/test_simd_shift_right.c similarity index 100% rename from lib/emscripten/emtests/test_simd_shift_right.c rename to lib/emscripten-tests/emtests/test_simd_shift_right.c diff --git a/lib/emscripten/emtests/test_simd_shift_right.out b/lib/emscripten-tests/emtests/test_simd_shift_right.out similarity index 100% rename from lib/emscripten/emtests/test_simd_shift_right.out rename to lib/emscripten-tests/emtests/test_simd_shift_right.out diff --git a/lib/emscripten/emtests/test_simd_sitofp.c b/lib/emscripten-tests/emtests/test_simd_sitofp.c similarity index 100% rename from lib/emscripten/emtests/test_simd_sitofp.c rename to lib/emscripten-tests/emtests/test_simd_sitofp.c diff --git a/lib/emscripten/emtests/test_simd_sitofp.out b/lib/emscripten-tests/emtests/test_simd_sitofp.out similarity index 100% rename from lib/emscripten/emtests/test_simd_sitofp.out rename to lib/emscripten-tests/emtests/test_simd_sitofp.out diff --git a/lib/emscripten/emtests/test_sintvars.c b/lib/emscripten-tests/emtests/test_sintvars.c similarity index 100% rename from lib/emscripten/emtests/test_sintvars.c rename to lib/emscripten-tests/emtests/test_sintvars.c diff --git a/lib/emscripten/emtests/test_sintvars.out b/lib/emscripten-tests/emtests/test_sintvars.out similarity index 100% rename from lib/emscripten/emtests/test_sintvars.out rename to lib/emscripten-tests/emtests/test_sintvars.out diff --git a/lib/emscripten/emtests/test_sintvars.wasm b/lib/emscripten-tests/emtests/test_sintvars.wasm similarity index 100% rename from lib/emscripten/emtests/test_sintvars.wasm rename to lib/emscripten-tests/emtests/test_sintvars.wasm diff --git a/lib/emscripten/emtests/test_sizeof.cpp b/lib/emscripten-tests/emtests/test_sizeof.cpp similarity index 100% rename from lib/emscripten/emtests/test_sizeof.cpp rename to lib/emscripten-tests/emtests/test_sizeof.cpp diff --git a/lib/emscripten/emtests/test_sizeof.out b/lib/emscripten-tests/emtests/test_sizeof.out similarity index 100% rename from lib/emscripten/emtests/test_sizeof.out rename to lib/emscripten-tests/emtests/test_sizeof.out diff --git a/lib/emscripten/emtests/test_sizeof.wasm b/lib/emscripten-tests/emtests/test_sizeof.wasm similarity index 100% rename from lib/emscripten/emtests/test_sizeof.wasm rename to lib/emscripten-tests/emtests/test_sizeof.wasm diff --git a/lib/emscripten/emtests/test_sscanf.c b/lib/emscripten-tests/emtests/test_sscanf.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf.c rename to lib/emscripten-tests/emtests/test_sscanf.c diff --git a/lib/emscripten/emtests/test_sscanf.out b/lib/emscripten-tests/emtests/test_sscanf.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf.out rename to lib/emscripten-tests/emtests/test_sscanf.out diff --git a/lib/emscripten/emtests/test_sscanf.wasm b/lib/emscripten-tests/emtests/test_sscanf.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf.wasm rename to lib/emscripten-tests/emtests/test_sscanf.wasm diff --git a/lib/emscripten/emtests/test_sscanf_3.c b/lib/emscripten-tests/emtests/test_sscanf_3.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_3.c rename to lib/emscripten-tests/emtests/test_sscanf_3.c diff --git a/lib/emscripten/emtests/test_sscanf_3.out b/lib/emscripten-tests/emtests/test_sscanf_3.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_3.out rename to lib/emscripten-tests/emtests/test_sscanf_3.out diff --git a/lib/emscripten/emtests/test_sscanf_3.wasm b/lib/emscripten-tests/emtests/test_sscanf_3.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_3.wasm rename to lib/emscripten-tests/emtests/test_sscanf_3.wasm diff --git a/lib/emscripten/emtests/test_sscanf_4.c b/lib/emscripten-tests/emtests/test_sscanf_4.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_4.c rename to lib/emscripten-tests/emtests/test_sscanf_4.c diff --git a/lib/emscripten/emtests/test_sscanf_4.out b/lib/emscripten-tests/emtests/test_sscanf_4.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_4.out rename to lib/emscripten-tests/emtests/test_sscanf_4.out diff --git a/lib/emscripten/emtests/test_sscanf_4.wasm b/lib/emscripten-tests/emtests/test_sscanf_4.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_4.wasm rename to lib/emscripten-tests/emtests/test_sscanf_4.wasm diff --git a/lib/emscripten/emtests/test_sscanf_5.c b/lib/emscripten-tests/emtests/test_sscanf_5.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_5.c rename to lib/emscripten-tests/emtests/test_sscanf_5.c diff --git a/lib/emscripten/emtests/test_sscanf_5.out b/lib/emscripten-tests/emtests/test_sscanf_5.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_5.out rename to lib/emscripten-tests/emtests/test_sscanf_5.out diff --git a/lib/emscripten/emtests/test_sscanf_5.wasm b/lib/emscripten-tests/emtests/test_sscanf_5.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_5.wasm rename to lib/emscripten-tests/emtests/test_sscanf_5.wasm diff --git a/lib/emscripten/emtests/test_sscanf_6.c b/lib/emscripten-tests/emtests/test_sscanf_6.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_6.c rename to lib/emscripten-tests/emtests/test_sscanf_6.c diff --git a/lib/emscripten/emtests/test_sscanf_6.out b/lib/emscripten-tests/emtests/test_sscanf_6.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_6.out rename to lib/emscripten-tests/emtests/test_sscanf_6.out diff --git a/lib/emscripten/emtests/test_sscanf_6.wasm b/lib/emscripten-tests/emtests/test_sscanf_6.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_6.wasm rename to lib/emscripten-tests/emtests/test_sscanf_6.wasm diff --git a/lib/emscripten/emtests/test_sscanf_caps.c b/lib/emscripten-tests/emtests/test_sscanf_caps.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_caps.c rename to lib/emscripten-tests/emtests/test_sscanf_caps.c diff --git a/lib/emscripten/emtests/test_sscanf_caps.out b/lib/emscripten-tests/emtests/test_sscanf_caps.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_caps.out rename to lib/emscripten-tests/emtests/test_sscanf_caps.out diff --git a/lib/emscripten/emtests/test_sscanf_caps.wasm b/lib/emscripten-tests/emtests/test_sscanf_caps.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_caps.wasm rename to lib/emscripten-tests/emtests/test_sscanf_caps.wasm diff --git a/lib/emscripten/emtests/test_sscanf_float.c b/lib/emscripten-tests/emtests/test_sscanf_float.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_float.c rename to lib/emscripten-tests/emtests/test_sscanf_float.c diff --git a/lib/emscripten/emtests/test_sscanf_float.out b/lib/emscripten-tests/emtests/test_sscanf_float.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_float.out rename to lib/emscripten-tests/emtests/test_sscanf_float.out diff --git a/lib/emscripten/emtests/test_sscanf_float.wasm b/lib/emscripten-tests/emtests/test_sscanf_float.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_float.wasm rename to lib/emscripten-tests/emtests/test_sscanf_float.wasm diff --git a/lib/emscripten/emtests/test_sscanf_hex.cpp b/lib/emscripten-tests/emtests/test_sscanf_hex.cpp similarity index 100% rename from lib/emscripten/emtests/test_sscanf_hex.cpp rename to lib/emscripten-tests/emtests/test_sscanf_hex.cpp diff --git a/lib/emscripten/emtests/test_sscanf_hex.out b/lib/emscripten-tests/emtests/test_sscanf_hex.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_hex.out rename to lib/emscripten-tests/emtests/test_sscanf_hex.out diff --git a/lib/emscripten/emtests/test_sscanf_hex.wasm b/lib/emscripten-tests/emtests/test_sscanf_hex.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_hex.wasm rename to lib/emscripten-tests/emtests/test_sscanf_hex.wasm diff --git a/lib/emscripten/emtests/test_sscanf_n.c b/lib/emscripten-tests/emtests/test_sscanf_n.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_n.c rename to lib/emscripten-tests/emtests/test_sscanf_n.c diff --git a/lib/emscripten/emtests/test_sscanf_n.out b/lib/emscripten-tests/emtests/test_sscanf_n.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_n.out rename to lib/emscripten-tests/emtests/test_sscanf_n.out diff --git a/lib/emscripten/emtests/test_sscanf_n.wasm b/lib/emscripten-tests/emtests/test_sscanf_n.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_n.wasm rename to lib/emscripten-tests/emtests/test_sscanf_n.wasm diff --git a/lib/emscripten/emtests/test_sscanf_other_whitespace.c b/lib/emscripten-tests/emtests/test_sscanf_other_whitespace.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_other_whitespace.c rename to lib/emscripten-tests/emtests/test_sscanf_other_whitespace.c diff --git a/lib/emscripten/emtests/test_sscanf_other_whitespace.out b/lib/emscripten-tests/emtests/test_sscanf_other_whitespace.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_other_whitespace.out rename to lib/emscripten-tests/emtests/test_sscanf_other_whitespace.out diff --git a/lib/emscripten/emtests/test_sscanf_other_whitespace.wasm b/lib/emscripten-tests/emtests/test_sscanf_other_whitespace.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_other_whitespace.wasm rename to lib/emscripten-tests/emtests/test_sscanf_other_whitespace.wasm diff --git a/lib/emscripten/emtests/test_sscanf_skip.c b/lib/emscripten-tests/emtests/test_sscanf_skip.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_skip.c rename to lib/emscripten-tests/emtests/test_sscanf_skip.c diff --git a/lib/emscripten/emtests/test_sscanf_skip.out b/lib/emscripten-tests/emtests/test_sscanf_skip.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_skip.out rename to lib/emscripten-tests/emtests/test_sscanf_skip.out diff --git a/lib/emscripten/emtests/test_sscanf_skip.wasm b/lib/emscripten-tests/emtests/test_sscanf_skip.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_skip.wasm rename to lib/emscripten-tests/emtests/test_sscanf_skip.wasm diff --git a/lib/emscripten/emtests/test_sscanf_whitespace.c b/lib/emscripten-tests/emtests/test_sscanf_whitespace.c similarity index 100% rename from lib/emscripten/emtests/test_sscanf_whitespace.c rename to lib/emscripten-tests/emtests/test_sscanf_whitespace.c diff --git a/lib/emscripten/emtests/test_sscanf_whitespace.out b/lib/emscripten-tests/emtests/test_sscanf_whitespace.out similarity index 100% rename from lib/emscripten/emtests/test_sscanf_whitespace.out rename to lib/emscripten-tests/emtests/test_sscanf_whitespace.out diff --git a/lib/emscripten/emtests/test_sscanf_whitespace.wasm b/lib/emscripten-tests/emtests/test_sscanf_whitespace.wasm similarity index 100% rename from lib/emscripten/emtests/test_sscanf_whitespace.wasm rename to lib/emscripten-tests/emtests/test_sscanf_whitespace.wasm diff --git a/lib/emscripten/emtests/test_stack.c b/lib/emscripten-tests/emtests/test_stack.c similarity index 100% rename from lib/emscripten/emtests/test_stack.c rename to lib/emscripten-tests/emtests/test_stack.c diff --git a/lib/emscripten/emtests/test_stack.out b/lib/emscripten-tests/emtests/test_stack.out similarity index 100% rename from lib/emscripten/emtests/test_stack.out rename to lib/emscripten-tests/emtests/test_stack.out diff --git a/lib/emscripten/emtests/test_stack_align.cpp b/lib/emscripten-tests/emtests/test_stack_align.cpp similarity index 100% rename from lib/emscripten/emtests/test_stack_align.cpp rename to lib/emscripten-tests/emtests/test_stack_align.cpp diff --git a/lib/emscripten/emtests/test_stack_align.wasm b/lib/emscripten-tests/emtests/test_stack_align.wasm similarity index 100% rename from lib/emscripten/emtests/test_stack_align.wasm rename to lib/emscripten-tests/emtests/test_stack_align.wasm diff --git a/lib/emscripten/emtests/test_stack_byval.c b/lib/emscripten-tests/emtests/test_stack_byval.c similarity index 100% rename from lib/emscripten/emtests/test_stack_byval.c rename to lib/emscripten-tests/emtests/test_stack_byval.c diff --git a/lib/emscripten/emtests/test_stack_byval.out b/lib/emscripten-tests/emtests/test_stack_byval.out similarity index 100% rename from lib/emscripten/emtests/test_stack_byval.out rename to lib/emscripten-tests/emtests/test_stack_byval.out diff --git a/lib/emscripten/emtests/test_stack_restore.c b/lib/emscripten-tests/emtests/test_stack_restore.c similarity index 100% rename from lib/emscripten/emtests/test_stack_restore.c rename to lib/emscripten-tests/emtests/test_stack_restore.c diff --git a/lib/emscripten/emtests/test_stack_restore.out b/lib/emscripten-tests/emtests/test_stack_restore.out similarity index 100% rename from lib/emscripten/emtests/test_stack_restore.out rename to lib/emscripten-tests/emtests/test_stack_restore.out diff --git a/lib/emscripten/emtests/test_stack_varargs.c b/lib/emscripten-tests/emtests/test_stack_varargs.c similarity index 100% rename from lib/emscripten/emtests/test_stack_varargs.c rename to lib/emscripten-tests/emtests/test_stack_varargs.c diff --git a/lib/emscripten/emtests/test_stack_varargs.out b/lib/emscripten-tests/emtests/test_stack_varargs.out similarity index 100% rename from lib/emscripten/emtests/test_stack_varargs.out rename to lib/emscripten-tests/emtests/test_stack_varargs.out diff --git a/lib/emscripten/emtests/test_stack_varargs.wasm b/lib/emscripten-tests/emtests/test_stack_varargs.wasm similarity index 100% rename from lib/emscripten/emtests/test_stack_varargs.wasm rename to lib/emscripten-tests/emtests/test_stack_varargs.wasm diff --git a/lib/emscripten/emtests/test_stack_void.c b/lib/emscripten-tests/emtests/test_stack_void.c similarity index 100% rename from lib/emscripten/emtests/test_stack_void.c rename to lib/emscripten-tests/emtests/test_stack_void.c diff --git a/lib/emscripten/emtests/test_stack_void.out b/lib/emscripten-tests/emtests/test_stack_void.out similarity index 100% rename from lib/emscripten/emtests/test_stack_void.out rename to lib/emscripten-tests/emtests/test_stack_void.out diff --git a/lib/emscripten/emtests/test_stack_void.wasm b/lib/emscripten-tests/emtests/test_stack_void.wasm similarity index 100% rename from lib/emscripten/emtests/test_stack_void.wasm rename to lib/emscripten-tests/emtests/test_stack_void.wasm diff --git a/lib/emscripten/emtests/test_static_variable.c b/lib/emscripten-tests/emtests/test_static_variable.c similarity index 100% rename from lib/emscripten/emtests/test_static_variable.c rename to lib/emscripten-tests/emtests/test_static_variable.c diff --git a/lib/emscripten/emtests/test_static_variable.out b/lib/emscripten-tests/emtests/test_static_variable.out similarity index 100% rename from lib/emscripten/emtests/test_static_variable.out rename to lib/emscripten-tests/emtests/test_static_variable.out diff --git a/lib/emscripten/emtests/test_statics.c b/lib/emscripten-tests/emtests/test_statics.c similarity index 100% rename from lib/emscripten/emtests/test_statics.c rename to lib/emscripten-tests/emtests/test_statics.c diff --git a/lib/emscripten/emtests/test_statics.out b/lib/emscripten-tests/emtests/test_statics.out similarity index 100% rename from lib/emscripten/emtests/test_statics.out rename to lib/emscripten-tests/emtests/test_statics.out diff --git a/lib/emscripten/emtests/test_statvfs.c b/lib/emscripten-tests/emtests/test_statvfs.c similarity index 100% rename from lib/emscripten/emtests/test_statvfs.c rename to lib/emscripten-tests/emtests/test_statvfs.c diff --git a/lib/emscripten/emtests/test_statvfs.out b/lib/emscripten-tests/emtests/test_statvfs.out similarity index 100% rename from lib/emscripten/emtests/test_statvfs.out rename to lib/emscripten-tests/emtests/test_statvfs.out diff --git a/lib/emscripten/emtests/test_statvfs.wasm b/lib/emscripten-tests/emtests/test_statvfs.wasm similarity index 100% rename from lib/emscripten/emtests/test_statvfs.wasm rename to lib/emscripten-tests/emtests/test_statvfs.wasm diff --git a/lib/emscripten/emtests/test_std_cout_new.cpp b/lib/emscripten-tests/emtests/test_std_cout_new.cpp similarity index 100% rename from lib/emscripten/emtests/test_std_cout_new.cpp rename to lib/emscripten-tests/emtests/test_std_cout_new.cpp diff --git a/lib/emscripten/emtests/test_std_cout_new.out b/lib/emscripten-tests/emtests/test_std_cout_new.out similarity index 100% rename from lib/emscripten/emtests/test_std_cout_new.out rename to lib/emscripten-tests/emtests/test_std_cout_new.out diff --git a/lib/emscripten/emtests/test_std_cout_new.wasm b/lib/emscripten-tests/emtests/test_std_cout_new.wasm similarity index 100% rename from lib/emscripten/emtests/test_std_cout_new.wasm rename to lib/emscripten-tests/emtests/test_std_cout_new.wasm diff --git a/lib/emscripten/emtests/test_stdlibs.c b/lib/emscripten-tests/emtests/test_stdlibs.c similarity index 100% rename from lib/emscripten/emtests/test_stdlibs.c rename to lib/emscripten-tests/emtests/test_stdlibs.c diff --git a/lib/emscripten/emtests/test_stdlibs.out b/lib/emscripten-tests/emtests/test_stdlibs.out similarity index 100% rename from lib/emscripten/emtests/test_stdlibs.out rename to lib/emscripten-tests/emtests/test_stdlibs.out diff --git a/lib/emscripten/emtests/test_stdvec.c b/lib/emscripten-tests/emtests/test_stdvec.c similarity index 100% rename from lib/emscripten/emtests/test_stdvec.c rename to lib/emscripten-tests/emtests/test_stdvec.c diff --git a/lib/emscripten/emtests/test_stdvec.out b/lib/emscripten-tests/emtests/test_stdvec.out similarity index 100% rename from lib/emscripten/emtests/test_stdvec.out rename to lib/emscripten-tests/emtests/test_stdvec.out diff --git a/lib/emscripten/emtests/test_strcasecmp.c b/lib/emscripten-tests/emtests/test_strcasecmp.c similarity index 100% rename from lib/emscripten/emtests/test_strcasecmp.c rename to lib/emscripten-tests/emtests/test_strcasecmp.c diff --git a/lib/emscripten/emtests/test_strcasecmp.out b/lib/emscripten-tests/emtests/test_strcasecmp.out similarity index 100% rename from lib/emscripten/emtests/test_strcasecmp.out rename to lib/emscripten-tests/emtests/test_strcasecmp.out diff --git a/lib/emscripten/emtests/test_strcasecmp.wasm b/lib/emscripten-tests/emtests/test_strcasecmp.wasm similarity index 100% rename from lib/emscripten/emtests/test_strcasecmp.wasm rename to lib/emscripten-tests/emtests/test_strcasecmp.wasm diff --git a/lib/emscripten/emtests/test_strcmp_uni.c b/lib/emscripten-tests/emtests/test_strcmp_uni.c similarity index 100% rename from lib/emscripten/emtests/test_strcmp_uni.c rename to lib/emscripten-tests/emtests/test_strcmp_uni.c diff --git a/lib/emscripten/emtests/test_strcmp_uni.out b/lib/emscripten-tests/emtests/test_strcmp_uni.out similarity index 100% rename from lib/emscripten/emtests/test_strcmp_uni.out rename to lib/emscripten-tests/emtests/test_strcmp_uni.out diff --git a/lib/emscripten/emtests/test_strcmp_uni.wasm b/lib/emscripten-tests/emtests/test_strcmp_uni.wasm similarity index 100% rename from lib/emscripten/emtests/test_strcmp_uni.wasm rename to lib/emscripten-tests/emtests/test_strcmp_uni.wasm diff --git a/lib/emscripten/emtests/test_strftime.cpp b/lib/emscripten-tests/emtests/test_strftime.cpp similarity index 100% rename from lib/emscripten/emtests/test_strftime.cpp rename to lib/emscripten-tests/emtests/test_strftime.cpp diff --git a/lib/emscripten/emtests/test_strftime.out b/lib/emscripten-tests/emtests/test_strftime.out similarity index 100% rename from lib/emscripten/emtests/test_strftime.out rename to lib/emscripten-tests/emtests/test_strftime.out diff --git a/lib/emscripten/emtests/test_strftime.wasm b/lib/emscripten-tests/emtests/test_strftime.wasm similarity index 100% rename from lib/emscripten/emtests/test_strftime.wasm rename to lib/emscripten-tests/emtests/test_strftime.wasm diff --git a/lib/emscripten/emtests/test_strings.c b/lib/emscripten-tests/emtests/test_strings.c similarity index 100% rename from lib/emscripten/emtests/test_strings.c rename to lib/emscripten-tests/emtests/test_strings.c diff --git a/lib/emscripten/emtests/test_strings.out b/lib/emscripten-tests/emtests/test_strings.out similarity index 100% rename from lib/emscripten/emtests/test_strings.out rename to lib/emscripten-tests/emtests/test_strings.out diff --git a/lib/emscripten/emtests/test_strings.wasm b/lib/emscripten-tests/emtests/test_strings.wasm similarity index 100% rename from lib/emscripten/emtests/test_strings.wasm rename to lib/emscripten-tests/emtests/test_strings.wasm diff --git a/lib/emscripten/emtests/test_strndup.c b/lib/emscripten-tests/emtests/test_strndup.c similarity index 100% rename from lib/emscripten/emtests/test_strndup.c rename to lib/emscripten-tests/emtests/test_strndup.c diff --git a/lib/emscripten/emtests/test_strndup.out b/lib/emscripten-tests/emtests/test_strndup.out similarity index 100% rename from lib/emscripten/emtests/test_strndup.out rename to lib/emscripten-tests/emtests/test_strndup.out diff --git a/lib/emscripten/emtests/test_strndup.wasm b/lib/emscripten-tests/emtests/test_strndup.wasm similarity index 100% rename from lib/emscripten/emtests/test_strndup.wasm rename to lib/emscripten-tests/emtests/test_strndup.wasm diff --git a/lib/emscripten/emtests/test_strptime_days.c b/lib/emscripten-tests/emtests/test_strptime_days.c similarity index 100% rename from lib/emscripten/emtests/test_strptime_days.c rename to lib/emscripten-tests/emtests/test_strptime_days.c diff --git a/lib/emscripten/emtests/test_strptime_days.out b/lib/emscripten-tests/emtests/test_strptime_days.out similarity index 100% rename from lib/emscripten/emtests/test_strptime_days.out rename to lib/emscripten-tests/emtests/test_strptime_days.out diff --git a/lib/emscripten/emtests/test_strptime_days.wasm b/lib/emscripten-tests/emtests/test_strptime_days.wasm similarity index 100% rename from lib/emscripten/emtests/test_strptime_days.wasm rename to lib/emscripten-tests/emtests/test_strptime_days.wasm diff --git a/lib/emscripten/emtests/test_strptime_reentrant.c b/lib/emscripten-tests/emtests/test_strptime_reentrant.c similarity index 100% rename from lib/emscripten/emtests/test_strptime_reentrant.c rename to lib/emscripten-tests/emtests/test_strptime_reentrant.c diff --git a/lib/emscripten/emtests/test_strptime_reentrant.out b/lib/emscripten-tests/emtests/test_strptime_reentrant.out similarity index 100% rename from lib/emscripten/emtests/test_strptime_reentrant.out rename to lib/emscripten-tests/emtests/test_strptime_reentrant.out diff --git a/lib/emscripten/emtests/test_strptime_reentrant.wasm b/lib/emscripten-tests/emtests/test_strptime_reentrant.wasm similarity index 100% rename from lib/emscripten/emtests/test_strptime_reentrant.wasm rename to lib/emscripten-tests/emtests/test_strptime_reentrant.wasm diff --git a/lib/emscripten/emtests/test_strptime_tm.c b/lib/emscripten-tests/emtests/test_strptime_tm.c similarity index 100% rename from lib/emscripten/emtests/test_strptime_tm.c rename to lib/emscripten-tests/emtests/test_strptime_tm.c diff --git a/lib/emscripten/emtests/test_strptime_tm.out b/lib/emscripten-tests/emtests/test_strptime_tm.out similarity index 100% rename from lib/emscripten/emtests/test_strptime_tm.out rename to lib/emscripten-tests/emtests/test_strptime_tm.out diff --git a/lib/emscripten/emtests/test_strstr.c b/lib/emscripten-tests/emtests/test_strstr.c similarity index 100% rename from lib/emscripten/emtests/test_strstr.c rename to lib/emscripten-tests/emtests/test_strstr.c diff --git a/lib/emscripten/emtests/test_strstr.out b/lib/emscripten-tests/emtests/test_strstr.out similarity index 100% rename from lib/emscripten/emtests/test_strstr.out rename to lib/emscripten-tests/emtests/test_strstr.out diff --git a/lib/emscripten/emtests/test_strstr.wasm b/lib/emscripten-tests/emtests/test_strstr.wasm similarity index 100% rename from lib/emscripten/emtests/test_strstr.wasm rename to lib/emscripten-tests/emtests/test_strstr.wasm diff --git a/lib/emscripten/emtests/test_strtod.c b/lib/emscripten-tests/emtests/test_strtod.c similarity index 100% rename from lib/emscripten/emtests/test_strtod.c rename to lib/emscripten-tests/emtests/test_strtod.c diff --git a/lib/emscripten/emtests/test_strtod.out b/lib/emscripten-tests/emtests/test_strtod.out similarity index 100% rename from lib/emscripten/emtests/test_strtod.out rename to lib/emscripten-tests/emtests/test_strtod.out diff --git a/lib/emscripten/emtests/test_strtod.wasm b/lib/emscripten-tests/emtests/test_strtod.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtod.wasm rename to lib/emscripten-tests/emtests/test_strtod.wasm diff --git a/lib/emscripten/emtests/test_strtok.c b/lib/emscripten-tests/emtests/test_strtok.c similarity index 100% rename from lib/emscripten/emtests/test_strtok.c rename to lib/emscripten-tests/emtests/test_strtok.c diff --git a/lib/emscripten/emtests/test_strtok.out b/lib/emscripten-tests/emtests/test_strtok.out similarity index 100% rename from lib/emscripten/emtests/test_strtok.out rename to lib/emscripten-tests/emtests/test_strtok.out diff --git a/lib/emscripten/emtests/test_strtok.wasm b/lib/emscripten-tests/emtests/test_strtok.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtok.wasm rename to lib/emscripten-tests/emtests/test_strtok.wasm diff --git a/lib/emscripten/emtests/test_strtol_bin.c b/lib/emscripten-tests/emtests/test_strtol_bin.c similarity index 100% rename from lib/emscripten/emtests/test_strtol_bin.c rename to lib/emscripten-tests/emtests/test_strtol_bin.c diff --git a/lib/emscripten/emtests/test_strtol_bin.out b/lib/emscripten-tests/emtests/test_strtol_bin.out similarity index 100% rename from lib/emscripten/emtests/test_strtol_bin.out rename to lib/emscripten-tests/emtests/test_strtol_bin.out diff --git a/lib/emscripten/emtests/test_strtol_bin.wasm b/lib/emscripten-tests/emtests/test_strtol_bin.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtol_bin.wasm rename to lib/emscripten-tests/emtests/test_strtol_bin.wasm diff --git a/lib/emscripten/emtests/test_strtol_dec.c b/lib/emscripten-tests/emtests/test_strtol_dec.c similarity index 100% rename from lib/emscripten/emtests/test_strtol_dec.c rename to lib/emscripten-tests/emtests/test_strtol_dec.c diff --git a/lib/emscripten/emtests/test_strtol_dec.out b/lib/emscripten-tests/emtests/test_strtol_dec.out similarity index 100% rename from lib/emscripten/emtests/test_strtol_dec.out rename to lib/emscripten-tests/emtests/test_strtol_dec.out diff --git a/lib/emscripten/emtests/test_strtol_dec.wasm b/lib/emscripten-tests/emtests/test_strtol_dec.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtol_dec.wasm rename to lib/emscripten-tests/emtests/test_strtol_dec.wasm diff --git a/lib/emscripten/emtests/test_strtol_hex.c b/lib/emscripten-tests/emtests/test_strtol_hex.c similarity index 100% rename from lib/emscripten/emtests/test_strtol_hex.c rename to lib/emscripten-tests/emtests/test_strtol_hex.c diff --git a/lib/emscripten/emtests/test_strtol_hex.out b/lib/emscripten-tests/emtests/test_strtol_hex.out similarity index 100% rename from lib/emscripten/emtests/test_strtol_hex.out rename to lib/emscripten-tests/emtests/test_strtol_hex.out diff --git a/lib/emscripten/emtests/test_strtol_hex.wasm b/lib/emscripten-tests/emtests/test_strtol_hex.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtol_hex.wasm rename to lib/emscripten-tests/emtests/test_strtol_hex.wasm diff --git a/lib/emscripten/emtests/test_strtol_oct.c b/lib/emscripten-tests/emtests/test_strtol_oct.c similarity index 100% rename from lib/emscripten/emtests/test_strtol_oct.c rename to lib/emscripten-tests/emtests/test_strtol_oct.c diff --git a/lib/emscripten/emtests/test_strtol_oct.out b/lib/emscripten-tests/emtests/test_strtol_oct.out similarity index 100% rename from lib/emscripten/emtests/test_strtol_oct.out rename to lib/emscripten-tests/emtests/test_strtol_oct.out diff --git a/lib/emscripten/emtests/test_strtol_oct.wasm b/lib/emscripten-tests/emtests/test_strtol_oct.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtol_oct.wasm rename to lib/emscripten-tests/emtests/test_strtol_oct.wasm diff --git a/lib/emscripten/emtests/test_strtold.c b/lib/emscripten-tests/emtests/test_strtold.c similarity index 100% rename from lib/emscripten/emtests/test_strtold.c rename to lib/emscripten-tests/emtests/test_strtold.c diff --git a/lib/emscripten/emtests/test_strtold.out b/lib/emscripten-tests/emtests/test_strtold.out similarity index 100% rename from lib/emscripten/emtests/test_strtold.out rename to lib/emscripten-tests/emtests/test_strtold.out diff --git a/lib/emscripten/emtests/test_strtold.wasm b/lib/emscripten-tests/emtests/test_strtold.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtold.wasm rename to lib/emscripten-tests/emtests/test_strtold.wasm diff --git a/lib/emscripten/emtests/test_strtoll_bin.c b/lib/emscripten-tests/emtests/test_strtoll_bin.c similarity index 100% rename from lib/emscripten/emtests/test_strtoll_bin.c rename to lib/emscripten-tests/emtests/test_strtoll_bin.c diff --git a/lib/emscripten/emtests/test_strtoll_bin.out b/lib/emscripten-tests/emtests/test_strtoll_bin.out similarity index 100% rename from lib/emscripten/emtests/test_strtoll_bin.out rename to lib/emscripten-tests/emtests/test_strtoll_bin.out diff --git a/lib/emscripten/emtests/test_strtoll_bin.wasm b/lib/emscripten-tests/emtests/test_strtoll_bin.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtoll_bin.wasm rename to lib/emscripten-tests/emtests/test_strtoll_bin.wasm diff --git a/lib/emscripten/emtests/test_strtoll_dec.c b/lib/emscripten-tests/emtests/test_strtoll_dec.c similarity index 100% rename from lib/emscripten/emtests/test_strtoll_dec.c rename to lib/emscripten-tests/emtests/test_strtoll_dec.c diff --git a/lib/emscripten/emtests/test_strtoll_dec.out b/lib/emscripten-tests/emtests/test_strtoll_dec.out similarity index 100% rename from lib/emscripten/emtests/test_strtoll_dec.out rename to lib/emscripten-tests/emtests/test_strtoll_dec.out diff --git a/lib/emscripten/emtests/test_strtoll_dec.wasm b/lib/emscripten-tests/emtests/test_strtoll_dec.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtoll_dec.wasm rename to lib/emscripten-tests/emtests/test_strtoll_dec.wasm diff --git a/lib/emscripten/emtests/test_strtoll_hex.c b/lib/emscripten-tests/emtests/test_strtoll_hex.c similarity index 100% rename from lib/emscripten/emtests/test_strtoll_hex.c rename to lib/emscripten-tests/emtests/test_strtoll_hex.c diff --git a/lib/emscripten/emtests/test_strtoll_hex.out b/lib/emscripten-tests/emtests/test_strtoll_hex.out similarity index 100% rename from lib/emscripten/emtests/test_strtoll_hex.out rename to lib/emscripten-tests/emtests/test_strtoll_hex.out diff --git a/lib/emscripten/emtests/test_strtoll_hex.wasm b/lib/emscripten-tests/emtests/test_strtoll_hex.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtoll_hex.wasm rename to lib/emscripten-tests/emtests/test_strtoll_hex.wasm diff --git a/lib/emscripten/emtests/test_strtoll_oct.c b/lib/emscripten-tests/emtests/test_strtoll_oct.c similarity index 100% rename from lib/emscripten/emtests/test_strtoll_oct.c rename to lib/emscripten-tests/emtests/test_strtoll_oct.c diff --git a/lib/emscripten/emtests/test_strtoll_oct.out b/lib/emscripten-tests/emtests/test_strtoll_oct.out similarity index 100% rename from lib/emscripten/emtests/test_strtoll_oct.out rename to lib/emscripten-tests/emtests/test_strtoll_oct.out diff --git a/lib/emscripten/emtests/test_strtoll_oct.wasm b/lib/emscripten-tests/emtests/test_strtoll_oct.wasm similarity index 100% rename from lib/emscripten/emtests/test_strtoll_oct.wasm rename to lib/emscripten-tests/emtests/test_strtoll_oct.wasm diff --git a/lib/emscripten/emtests/test_struct_varargs.c b/lib/emscripten-tests/emtests/test_struct_varargs.c similarity index 100% rename from lib/emscripten/emtests/test_struct_varargs.c rename to lib/emscripten-tests/emtests/test_struct_varargs.c diff --git a/lib/emscripten/emtests/test_struct_varargs.out b/lib/emscripten-tests/emtests/test_struct_varargs.out similarity index 100% rename from lib/emscripten/emtests/test_struct_varargs.out rename to lib/emscripten-tests/emtests/test_struct_varargs.out diff --git a/lib/emscripten/emtests/test_struct_varargs.wasm b/lib/emscripten-tests/emtests/test_struct_varargs.wasm similarity index 100% rename from lib/emscripten/emtests/test_struct_varargs.wasm rename to lib/emscripten-tests/emtests/test_struct_varargs.wasm diff --git a/lib/emscripten/emtests/test_structs.c b/lib/emscripten-tests/emtests/test_structs.c similarity index 100% rename from lib/emscripten/emtests/test_structs.c rename to lib/emscripten-tests/emtests/test_structs.c diff --git a/lib/emscripten/emtests/test_structs.out b/lib/emscripten-tests/emtests/test_structs.out similarity index 100% rename from lib/emscripten/emtests/test_structs.out rename to lib/emscripten-tests/emtests/test_structs.out diff --git a/lib/emscripten/emtests/test_time_c.c b/lib/emscripten-tests/emtests/test_time_c.c similarity index 100% rename from lib/emscripten/emtests/test_time_c.c rename to lib/emscripten-tests/emtests/test_time_c.c diff --git a/lib/emscripten/emtests/test_time_c.out b/lib/emscripten-tests/emtests/test_time_c.out similarity index 100% rename from lib/emscripten/emtests/test_time_c.out rename to lib/emscripten-tests/emtests/test_time_c.out diff --git a/lib/emscripten/emtests/test_time_c.wasm b/lib/emscripten-tests/emtests/test_time_c.wasm similarity index 100% rename from lib/emscripten/emtests/test_time_c.wasm rename to lib/emscripten-tests/emtests/test_time_c.wasm diff --git a/lib/emscripten/emtests/test_timeb.c b/lib/emscripten-tests/emtests/test_timeb.c similarity index 100% rename from lib/emscripten/emtests/test_timeb.c rename to lib/emscripten-tests/emtests/test_timeb.c diff --git a/lib/emscripten/emtests/test_timeb.out b/lib/emscripten-tests/emtests/test_timeb.out similarity index 100% rename from lib/emscripten/emtests/test_timeb.out rename to lib/emscripten-tests/emtests/test_timeb.out diff --git a/lib/emscripten/emtests/test_tinyfuncstr.c b/lib/emscripten-tests/emtests/test_tinyfuncstr.c similarity index 100% rename from lib/emscripten/emtests/test_tinyfuncstr.c rename to lib/emscripten-tests/emtests/test_tinyfuncstr.c diff --git a/lib/emscripten/emtests/test_tinyfuncstr.out b/lib/emscripten-tests/emtests/test_tinyfuncstr.out similarity index 100% rename from lib/emscripten/emtests/test_tinyfuncstr.out rename to lib/emscripten-tests/emtests/test_tinyfuncstr.out diff --git a/lib/emscripten/emtests/test_tracing.c b/lib/emscripten-tests/emtests/test_tracing.c similarity index 100% rename from lib/emscripten/emtests/test_tracing.c rename to lib/emscripten-tests/emtests/test_tracing.c diff --git a/lib/emscripten/emtests/test_tracing.out b/lib/emscripten-tests/emtests/test_tracing.out similarity index 100% rename from lib/emscripten/emtests/test_tracing.out rename to lib/emscripten-tests/emtests/test_tracing.out diff --git a/lib/emscripten/emtests/test_tracing.wasm b/lib/emscripten-tests/emtests/test_tracing.wasm similarity index 100% rename from lib/emscripten/emtests/test_tracing.wasm rename to lib/emscripten-tests/emtests/test_tracing.wasm diff --git a/lib/emscripten/emtests/test_transtrcase.c b/lib/emscripten-tests/emtests/test_transtrcase.c similarity index 100% rename from lib/emscripten/emtests/test_transtrcase.c rename to lib/emscripten-tests/emtests/test_transtrcase.c diff --git a/lib/emscripten/emtests/test_transtrcase.out b/lib/emscripten-tests/emtests/test_transtrcase.out similarity index 100% rename from lib/emscripten/emtests/test_transtrcase.out rename to lib/emscripten-tests/emtests/test_transtrcase.out diff --git a/lib/emscripten/emtests/test_transtrcase.wasm b/lib/emscripten-tests/emtests/test_transtrcase.wasm similarity index 100% rename from lib/emscripten/emtests/test_transtrcase.wasm rename to lib/emscripten-tests/emtests/test_transtrcase.wasm diff --git a/lib/emscripten/emtests/test_trickystring.c b/lib/emscripten-tests/emtests/test_trickystring.c similarity index 100% rename from lib/emscripten/emtests/test_trickystring.c rename to lib/emscripten-tests/emtests/test_trickystring.c diff --git a/lib/emscripten/emtests/test_trickystring.out b/lib/emscripten-tests/emtests/test_trickystring.out similarity index 100% rename from lib/emscripten/emtests/test_trickystring.out rename to lib/emscripten-tests/emtests/test_trickystring.out diff --git a/lib/emscripten/emtests/test_trickystring.wasm b/lib/emscripten-tests/emtests/test_trickystring.wasm similarity index 100% rename from lib/emscripten/emtests/test_trickystring.wasm rename to lib/emscripten-tests/emtests/test_trickystring.wasm diff --git a/lib/emscripten/emtests/test_typeid.c b/lib/emscripten-tests/emtests/test_typeid.c similarity index 100% rename from lib/emscripten/emtests/test_typeid.c rename to lib/emscripten-tests/emtests/test_typeid.c diff --git a/lib/emscripten/emtests/test_typeid.out b/lib/emscripten-tests/emtests/test_typeid.out similarity index 100% rename from lib/emscripten/emtests/test_typeid.out rename to lib/emscripten-tests/emtests/test_typeid.out diff --git a/lib/emscripten/emtests/test_uname.c b/lib/emscripten-tests/emtests/test_uname.c similarity index 100% rename from lib/emscripten/emtests/test_uname.c rename to lib/emscripten-tests/emtests/test_uname.c diff --git a/lib/emscripten/emtests/test_uname.out b/lib/emscripten-tests/emtests/test_uname.out similarity index 100% rename from lib/emscripten/emtests/test_uname.out rename to lib/emscripten-tests/emtests/test_uname.out diff --git a/lib/emscripten/emtests/test_uname.wasm b/lib/emscripten-tests/emtests/test_uname.wasm similarity index 100% rename from lib/emscripten/emtests/test_uname.wasm rename to lib/emscripten-tests/emtests/test_uname.wasm diff --git a/lib/emscripten/emtests/test_unary_literal.cpp b/lib/emscripten-tests/emtests/test_unary_literal.cpp similarity index 100% rename from lib/emscripten/emtests/test_unary_literal.cpp rename to lib/emscripten-tests/emtests/test_unary_literal.cpp diff --git a/lib/emscripten/emtests/test_unary_literal.out b/lib/emscripten-tests/emtests/test_unary_literal.out similarity index 100% rename from lib/emscripten/emtests/test_unary_literal.out rename to lib/emscripten-tests/emtests/test_unary_literal.out diff --git a/lib/emscripten/emtests/test_unary_literal.wasm b/lib/emscripten-tests/emtests/test_unary_literal.wasm similarity index 100% rename from lib/emscripten/emtests/test_unary_literal.wasm rename to lib/emscripten-tests/emtests/test_unary_literal.wasm diff --git a/lib/emscripten/emtests/test_utf.c b/lib/emscripten-tests/emtests/test_utf.c similarity index 100% rename from lib/emscripten/emtests/test_utf.c rename to lib/emscripten-tests/emtests/test_utf.c diff --git a/lib/emscripten/emtests/test_utf.out b/lib/emscripten-tests/emtests/test_utf.out similarity index 100% rename from lib/emscripten/emtests/test_utf.out rename to lib/emscripten-tests/emtests/test_utf.out diff --git a/lib/emscripten/emtests/test_utf.wasm b/lib/emscripten-tests/emtests/test_utf.wasm similarity index 100% rename from lib/emscripten/emtests/test_utf.wasm rename to lib/emscripten-tests/emtests/test_utf.wasm diff --git a/lib/emscripten/emtests/test_varargs.c b/lib/emscripten-tests/emtests/test_varargs.c similarity index 100% rename from lib/emscripten/emtests/test_varargs.c rename to lib/emscripten-tests/emtests/test_varargs.c diff --git a/lib/emscripten/emtests/test_varargs.out b/lib/emscripten-tests/emtests/test_varargs.out similarity index 100% rename from lib/emscripten/emtests/test_varargs.out rename to lib/emscripten-tests/emtests/test_varargs.out diff --git a/lib/emscripten/emtests/test_varargs.wasm b/lib/emscripten-tests/emtests/test_varargs.wasm similarity index 100% rename from lib/emscripten/emtests/test_varargs.wasm rename to lib/emscripten-tests/emtests/test_varargs.wasm diff --git a/lib/emscripten/emtests/test_varargs_multi.c b/lib/emscripten-tests/emtests/test_varargs_multi.c similarity index 100% rename from lib/emscripten/emtests/test_varargs_multi.c rename to lib/emscripten-tests/emtests/test_varargs_multi.c diff --git a/lib/emscripten/emtests/test_varargs_multi.out b/lib/emscripten-tests/emtests/test_varargs_multi.out similarity index 100% rename from lib/emscripten/emtests/test_varargs_multi.out rename to lib/emscripten-tests/emtests/test_varargs_multi.out diff --git a/lib/emscripten/emtests/test_varargs_multi.wasm b/lib/emscripten-tests/emtests/test_varargs_multi.wasm similarity index 100% rename from lib/emscripten/emtests/test_varargs_multi.wasm rename to lib/emscripten-tests/emtests/test_varargs_multi.wasm diff --git a/lib/emscripten/emtests/test_vfs.c b/lib/emscripten-tests/emtests/test_vfs.c similarity index 100% rename from lib/emscripten/emtests/test_vfs.c rename to lib/emscripten-tests/emtests/test_vfs.c diff --git a/lib/emscripten/emtests/test_vfs.md b/lib/emscripten-tests/emtests/test_vfs.md similarity index 100% rename from lib/emscripten/emtests/test_vfs.md rename to lib/emscripten-tests/emtests/test_vfs.md diff --git a/lib/emscripten/emtests/test_vfs.out b/lib/emscripten-tests/emtests/test_vfs.out similarity index 100% rename from lib/emscripten/emtests/test_vfs.out rename to lib/emscripten-tests/emtests/test_vfs.out diff --git a/lib/emscripten/emtests/test_vfs.wasm b/lib/emscripten-tests/emtests/test_vfs.wasm similarity index 100% rename from lib/emscripten/emtests/test_vfs.wasm rename to lib/emscripten-tests/emtests/test_vfs.wasm diff --git a/lib/emscripten/emtests/test_vfs_bundle.wasm b/lib/emscripten-tests/emtests/test_vfs_bundle.wasm similarity index 100% rename from lib/emscripten/emtests/test_vfs_bundle.wasm rename to lib/emscripten-tests/emtests/test_vfs_bundle.wasm diff --git a/lib/emscripten/emtests/test_vfs_data.txt b/lib/emscripten-tests/emtests/test_vfs_data.txt similarity index 100% rename from lib/emscripten/emtests/test_vfs_data.txt rename to lib/emscripten-tests/emtests/test_vfs_data.txt diff --git a/lib/emscripten/emtests/test_vprintf.c b/lib/emscripten-tests/emtests/test_vprintf.c similarity index 100% rename from lib/emscripten/emtests/test_vprintf.c rename to lib/emscripten-tests/emtests/test_vprintf.c diff --git a/lib/emscripten/emtests/test_vprintf.out b/lib/emscripten-tests/emtests/test_vprintf.out similarity index 100% rename from lib/emscripten/emtests/test_vprintf.out rename to lib/emscripten-tests/emtests/test_vprintf.out diff --git a/lib/emscripten/emtests/test_vprintf.wasm b/lib/emscripten-tests/emtests/test_vprintf.wasm similarity index 100% rename from lib/emscripten/emtests/test_vprintf.wasm rename to lib/emscripten-tests/emtests/test_vprintf.wasm diff --git a/lib/emscripten/emtests/test_vsnprintf.c b/lib/emscripten-tests/emtests/test_vsnprintf.c similarity index 100% rename from lib/emscripten/emtests/test_vsnprintf.c rename to lib/emscripten-tests/emtests/test_vsnprintf.c diff --git a/lib/emscripten/emtests/test_vsnprintf.out b/lib/emscripten-tests/emtests/test_vsnprintf.out similarity index 100% rename from lib/emscripten/emtests/test_vsnprintf.out rename to lib/emscripten-tests/emtests/test_vsnprintf.out diff --git a/lib/emscripten/emtests/test_vsnprintf.wasm b/lib/emscripten-tests/emtests/test_vsnprintf.wasm similarity index 100% rename from lib/emscripten/emtests/test_vsnprintf.wasm rename to lib/emscripten-tests/emtests/test_vsnprintf.wasm diff --git a/lib/emscripten/emtests/test_wprintf.cpp b/lib/emscripten-tests/emtests/test_wprintf.cpp similarity index 100% rename from lib/emscripten/emtests/test_wprintf.cpp rename to lib/emscripten-tests/emtests/test_wprintf.cpp diff --git a/lib/emscripten/emtests/test_wprintf.out b/lib/emscripten-tests/emtests/test_wprintf.out similarity index 100% rename from lib/emscripten/emtests/test_wprintf.out rename to lib/emscripten-tests/emtests/test_wprintf.out diff --git a/lib/emscripten/emtests/test_wprintf.wasm b/lib/emscripten-tests/emtests/test_wprintf.wasm similarity index 100% rename from lib/emscripten/emtests/test_wprintf.wasm rename to lib/emscripten-tests/emtests/test_wprintf.wasm diff --git a/lib/emscripten/emtests/test_write_stdout_fileno.c b/lib/emscripten-tests/emtests/test_write_stdout_fileno.c similarity index 100% rename from lib/emscripten/emtests/test_write_stdout_fileno.c rename to lib/emscripten-tests/emtests/test_write_stdout_fileno.c diff --git a/lib/emscripten/emtests/test_write_stdout_fileno.out b/lib/emscripten-tests/emtests/test_write_stdout_fileno.out similarity index 100% rename from lib/emscripten/emtests/test_write_stdout_fileno.out rename to lib/emscripten-tests/emtests/test_write_stdout_fileno.out diff --git a/lib/emscripten/emtests/test_write_stdout_fileno.wasm b/lib/emscripten-tests/emtests/test_write_stdout_fileno.wasm similarity index 100% rename from lib/emscripten/emtests/test_write_stdout_fileno.wasm rename to lib/emscripten-tests/emtests/test_write_stdout_fileno.wasm diff --git a/lib/emscripten/emtests/test_zero_multiplication.c b/lib/emscripten-tests/emtests/test_zero_multiplication.c similarity index 100% rename from lib/emscripten/emtests/test_zero_multiplication.c rename to lib/emscripten-tests/emtests/test_zero_multiplication.c diff --git a/lib/emscripten/emtests/test_zero_multiplication.out b/lib/emscripten-tests/emtests/test_zero_multiplication.out similarity index 100% rename from lib/emscripten/emtests/test_zero_multiplication.out rename to lib/emscripten-tests/emtests/test_zero_multiplication.out diff --git a/lib/emscripten/emtests/test_zero_multiplication.wasm b/lib/emscripten-tests/emtests/test_zero_multiplication.wasm similarity index 100% rename from lib/emscripten/emtests/test_zero_multiplication.wasm rename to lib/emscripten-tests/emtests/test_zero_multiplication.wasm diff --git a/lib/emscripten/emtests/test_zerodiv.c b/lib/emscripten-tests/emtests/test_zerodiv.c similarity index 100% rename from lib/emscripten/emtests/test_zerodiv.c rename to lib/emscripten-tests/emtests/test_zerodiv.c diff --git a/lib/emscripten/emtests/test_zerodiv.out b/lib/emscripten-tests/emtests/test_zerodiv.out similarity index 100% rename from lib/emscripten/emtests/test_zerodiv.out rename to lib/emscripten-tests/emtests/test_zerodiv.out diff --git a/lib/emscripten/emtests/test_zerodiv.wasm b/lib/emscripten-tests/emtests/test_zerodiv.wasm similarity index 100% rename from lib/emscripten/emtests/test_zerodiv.wasm rename to lib/emscripten-tests/emtests/test_zerodiv.wasm diff --git a/lib/emscripten-tests/src/lib.rs b/lib/emscripten-tests/src/lib.rs new file mode 100644 index 000000000..1da0abc73 --- /dev/null +++ b/lib/emscripten-tests/src/lib.rs @@ -0,0 +1,53 @@ +#[cfg(test)] +mod tests { + use std::sync::Arc; + use wabt::wat2wasm; + use wasmer_emscripten::is_emscripten_module; + use wasmer_runtime_core::backend::Compiler; + use wasmer_runtime_core::compile_with; + + #[cfg(feature = "clif")] + fn get_compiler() -> impl Compiler { + use wasmer_clif_backend::CraneliftCompiler; + CraneliftCompiler::new() + } + + #[cfg(feature = "llvm")] + fn get_compiler() -> impl Compiler { + use wasmer_llvm_backend::LLVMCompiler; + LLVMCompiler::new() + } + + #[cfg(feature = "singlepass")] + fn get_compiler() -> impl Compiler { + use wasmer_singlepass_backend::SinglePassCompiler; + SinglePassCompiler::new() + } + + #[cfg(not(any(feature = "llvm", feature = "clif", feature = "singlepass")))] + fn get_compiler() -> impl Compiler { + panic!("compiler not specified, activate a compiler via features"); + use wasmer_clif_backend::CraneliftCompiler; + CraneliftCompiler::new() + } + + #[test] + fn should_detect_emscripten_files() { + const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_true.wast"); + let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm"); + let module = + compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled"); + let module = Arc::new(module); + assert!(is_emscripten_module(&module)); + } + + #[test] + fn should_detect_non_emscripten_files() { + const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_false.wast"); + let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm"); + let module = + compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled"); + let module = Arc::new(module); + assert!(!is_emscripten_module(&module)); + } +} diff --git a/lib/emscripten/src/tests/is_emscripten_false.wast b/lib/emscripten-tests/src/tests/is_emscripten_false.wast similarity index 100% rename from lib/emscripten/src/tests/is_emscripten_false.wast rename to lib/emscripten-tests/src/tests/is_emscripten_false.wast diff --git a/lib/emscripten/src/tests/is_emscripten_true.wast b/lib/emscripten-tests/src/tests/is_emscripten_true.wast similarity index 100% rename from lib/emscripten/src/tests/is_emscripten_true.wast rename to lib/emscripten-tests/src/tests/is_emscripten_true.wast diff --git a/lib/emscripten/tests/emtest.rs b/lib/emscripten-tests/tests/emtest.rs similarity index 100% rename from lib/emscripten/tests/emtest.rs rename to lib/emscripten-tests/tests/emtest.rs diff --git a/lib/emscripten/tests/emtests/_common.rs b/lib/emscripten-tests/tests/emtests/_common.rs similarity index 100% rename from lib/emscripten/tests/emtests/_common.rs rename to lib/emscripten-tests/tests/emtests/_common.rs diff --git a/lib/emscripten/tests/emtests/clock_gettime.rs b/lib/emscripten-tests/tests/emtests/clock_gettime.rs similarity index 100% rename from lib/emscripten/tests/emtests/clock_gettime.rs rename to lib/emscripten-tests/tests/emtests/clock_gettime.rs diff --git a/lib/emscripten/tests/emtests/emscripten_get_compiler_setting.rs b/lib/emscripten-tests/tests/emtests/emscripten_get_compiler_setting.rs similarity index 100% rename from lib/emscripten/tests/emtests/emscripten_get_compiler_setting.rs rename to lib/emscripten-tests/tests/emtests/emscripten_get_compiler_setting.rs diff --git a/lib/emscripten/tests/emtests/env.rs b/lib/emscripten-tests/tests/emtests/env.rs similarity index 100% rename from lib/emscripten/tests/emtests/env.rs rename to lib/emscripten-tests/tests/emtests/env.rs diff --git a/lib/emscripten/tests/emtests/fs_exports.rs b/lib/emscripten-tests/tests/emtests/fs_exports.rs similarity index 100% rename from lib/emscripten/tests/emtests/fs_exports.rs rename to lib/emscripten-tests/tests/emtests/fs_exports.rs diff --git a/lib/emscripten/tests/emtests/getvalue_setvalue.rs b/lib/emscripten-tests/tests/emtests/getvalue_setvalue.rs similarity index 100% rename from lib/emscripten/tests/emtests/getvalue_setvalue.rs rename to lib/emscripten-tests/tests/emtests/getvalue_setvalue.rs diff --git a/lib/emscripten/tests/emtests/legacy_exported_runtime_numbers.rs b/lib/emscripten-tests/tests/emtests/legacy_exported_runtime_numbers.rs similarity index 100% rename from lib/emscripten/tests/emtests/legacy_exported_runtime_numbers.rs rename to lib/emscripten-tests/tests/emtests/legacy_exported_runtime_numbers.rs diff --git a/lib/emscripten/tests/emtests/localtime.rs b/lib/emscripten-tests/tests/emtests/localtime.rs similarity index 100% rename from lib/emscripten/tests/emtests/localtime.rs rename to lib/emscripten-tests/tests/emtests/localtime.rs diff --git a/lib/emscripten/tests/emtests/mod.rs b/lib/emscripten-tests/tests/emtests/mod.rs similarity index 100% rename from lib/emscripten/tests/emtests/mod.rs rename to lib/emscripten-tests/tests/emtests/mod.rs diff --git a/lib/emscripten/tests/emtests/modularize_closure_pre.rs b/lib/emscripten-tests/tests/emtests/modularize_closure_pre.rs similarity index 100% rename from lib/emscripten/tests/emtests/modularize_closure_pre.rs rename to lib/emscripten-tests/tests/emtests/modularize_closure_pre.rs diff --git a/lib/emscripten/tests/emtests/printf.rs b/lib/emscripten-tests/tests/emtests/printf.rs similarity index 100% rename from lib/emscripten/tests/emtests/printf.rs rename to lib/emscripten-tests/tests/emtests/printf.rs diff --git a/lib/emscripten/tests/emtests/puts.rs b/lib/emscripten-tests/tests/emtests/puts.rs similarity index 100% rename from lib/emscripten/tests/emtests/puts.rs rename to lib/emscripten-tests/tests/emtests/puts.rs diff --git a/lib/emscripten/tests/emtests/stackalloc.rs b/lib/emscripten-tests/tests/emtests/stackalloc.rs similarity index 100% rename from lib/emscripten/tests/emtests/stackalloc.rs rename to lib/emscripten-tests/tests/emtests/stackalloc.rs diff --git a/lib/emscripten-tests/tests/emtests/syscalls.rs b/lib/emscripten-tests/tests/emtests/syscalls.rs new file mode 100644 index 000000000..e69de29bb diff --git a/lib/emscripten/tests/emtests/test_addr_of_stacked.rs b/lib/emscripten-tests/tests/emtests/test_addr_of_stacked.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_addr_of_stacked.rs rename to lib/emscripten-tests/tests/emtests/test_addr_of_stacked.rs diff --git a/lib/emscripten/tests/emtests/test_alloca.rs b/lib/emscripten-tests/tests/emtests/test_alloca.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_alloca.rs rename to lib/emscripten-tests/tests/emtests/test_alloca.rs diff --git a/lib/emscripten/tests/emtests/test_alloca_stack.rs b/lib/emscripten-tests/tests/emtests/test_alloca_stack.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_alloca_stack.rs rename to lib/emscripten-tests/tests/emtests/test_alloca_stack.rs diff --git a/lib/emscripten/tests/emtests/test_array2.rs b/lib/emscripten-tests/tests/emtests/test_array2.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_array2.rs rename to lib/emscripten-tests/tests/emtests/test_array2.rs diff --git a/lib/emscripten/tests/emtests/test_array2b.rs b/lib/emscripten-tests/tests/emtests/test_array2b.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_array2b.rs rename to lib/emscripten-tests/tests/emtests/test_array2b.rs diff --git a/lib/emscripten/tests/emtests/test_atomic.rs b/lib/emscripten-tests/tests/emtests/test_atomic.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_atomic.rs rename to lib/emscripten-tests/tests/emtests/test_atomic.rs diff --git a/lib/emscripten/tests/emtests/test_atox.rs b/lib/emscripten-tests/tests/emtests/test_atox.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_atox.rs rename to lib/emscripten-tests/tests/emtests/test_atox.rs diff --git a/lib/emscripten/tests/emtests/test_bsearch.rs b/lib/emscripten-tests/tests/emtests/test_bsearch.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_bsearch.rs rename to lib/emscripten-tests/tests/emtests/test_bsearch.rs diff --git a/lib/emscripten/tests/emtests/test_ccall.rs b/lib/emscripten-tests/tests/emtests/test_ccall.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_ccall.rs rename to lib/emscripten-tests/tests/emtests/test_ccall.rs diff --git a/lib/emscripten/tests/emtests/test_complex.rs b/lib/emscripten-tests/tests/emtests/test_complex.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_complex.rs rename to lib/emscripten-tests/tests/emtests/test_complex.rs diff --git a/lib/emscripten/tests/emtests/test_demangle_stacks.rs b/lib/emscripten-tests/tests/emtests/test_demangle_stacks.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_demangle_stacks.rs rename to lib/emscripten-tests/tests/emtests/test_demangle_stacks.rs diff --git a/lib/emscripten/tests/emtests/test_demangle_stacks_noassert.rs b/lib/emscripten-tests/tests/emtests/test_demangle_stacks_noassert.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_demangle_stacks_noassert.rs rename to lib/emscripten-tests/tests/emtests/test_demangle_stacks_noassert.rs diff --git a/lib/emscripten/tests/emtests/test_dlmalloc_partial_2.rs b/lib/emscripten-tests/tests/emtests/test_dlmalloc_partial_2.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_dlmalloc_partial_2.rs rename to lib/emscripten-tests/tests/emtests/test_dlmalloc_partial_2.rs diff --git a/lib/emscripten/tests/emtests/test_double_varargs.rs b/lib/emscripten-tests/tests/emtests/test_double_varargs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_double_varargs.rs rename to lib/emscripten-tests/tests/emtests/test_double_varargs.rs diff --git a/lib/emscripten/tests/emtests/test_em_asm.rs b/lib/emscripten-tests/tests/emtests/test_em_asm.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_em_asm.rs rename to lib/emscripten-tests/tests/emtests/test_em_asm.rs diff --git a/lib/emscripten/tests/emtests/test_em_asm_2.rs b/lib/emscripten-tests/tests/emtests/test_em_asm_2.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_em_asm_2.rs rename to lib/emscripten-tests/tests/emtests/test_em_asm_2.rs diff --git a/lib/emscripten/tests/emtests/test_em_asm_parameter_pack.rs b/lib/emscripten-tests/tests/emtests/test_em_asm_parameter_pack.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_em_asm_parameter_pack.rs rename to lib/emscripten-tests/tests/emtests/test_em_asm_parameter_pack.rs diff --git a/lib/emscripten/tests/emtests/test_em_asm_signatures.rs b/lib/emscripten-tests/tests/emtests/test_em_asm_signatures.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_em_asm_signatures.rs rename to lib/emscripten-tests/tests/emtests/test_em_asm_signatures.rs diff --git a/lib/emscripten/tests/emtests/test_em_asm_unicode.rs b/lib/emscripten-tests/tests/emtests/test_em_asm_unicode.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_em_asm_unicode.rs rename to lib/emscripten-tests/tests/emtests/test_em_asm_unicode.rs diff --git a/lib/emscripten/tests/emtests/test_em_asm_unused_arguments.rs b/lib/emscripten-tests/tests/emtests/test_em_asm_unused_arguments.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_em_asm_unused_arguments.rs rename to lib/emscripten-tests/tests/emtests/test_em_asm_unused_arguments.rs diff --git a/lib/emscripten/tests/emtests/test_em_js.rs b/lib/emscripten-tests/tests/emtests/test_em_js.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_em_js.rs rename to lib/emscripten-tests/tests/emtests/test_em_js.rs diff --git a/lib/emscripten/tests/emtests/test_emscripten_api.rs b/lib/emscripten-tests/tests/emtests/test_emscripten_api.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_emscripten_api.rs rename to lib/emscripten-tests/tests/emtests/test_emscripten_api.rs diff --git a/lib/emscripten/tests/emtests/test_erf.rs b/lib/emscripten-tests/tests/emtests/test_erf.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_erf.rs rename to lib/emscripten-tests/tests/emtests/test_erf.rs diff --git a/lib/emscripten/tests/emtests/test_errar.rs b/lib/emscripten-tests/tests/emtests/test_errar.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_errar.rs rename to lib/emscripten-tests/tests/emtests/test_errar.rs diff --git a/lib/emscripten/tests/emtests/test_exceptions_2.rs b/lib/emscripten-tests/tests/emtests/test_exceptions_2.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_exceptions_2.rs rename to lib/emscripten-tests/tests/emtests/test_exceptions_2.rs diff --git a/lib/emscripten/tests/emtests/test_exceptions_multi.rs b/lib/emscripten-tests/tests/emtests/test_exceptions_multi.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_exceptions_multi.rs rename to lib/emscripten-tests/tests/emtests/test_exceptions_multi.rs diff --git a/lib/emscripten/tests/emtests/test_exceptions_std.rs b/lib/emscripten-tests/tests/emtests/test_exceptions_std.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_exceptions_std.rs rename to lib/emscripten-tests/tests/emtests/test_exceptions_std.rs diff --git a/lib/emscripten/tests/emtests/test_exceptions_white_list.rs b/lib/emscripten-tests/tests/emtests/test_exceptions_white_list.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_exceptions_white_list.rs rename to lib/emscripten-tests/tests/emtests/test_exceptions_white_list.rs diff --git a/lib/emscripten/tests/emtests/test_execvp.rs b/lib/emscripten-tests/tests/emtests/test_execvp.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_execvp.rs rename to lib/emscripten-tests/tests/emtests/test_execvp.rs diff --git a/lib/emscripten/tests/emtests/test_fast_math.rs b/lib/emscripten-tests/tests/emtests/test_fast_math.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_fast_math.rs rename to lib/emscripten-tests/tests/emtests/test_fast_math.rs diff --git a/lib/emscripten/tests/emtests/test_flexarray_struct.rs b/lib/emscripten-tests/tests/emtests/test_flexarray_struct.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_flexarray_struct.rs rename to lib/emscripten-tests/tests/emtests/test_flexarray_struct.rs diff --git a/lib/emscripten/tests/emtests/test_float32_precise.rs b/lib/emscripten-tests/tests/emtests/test_float32_precise.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_float32_precise.rs rename to lib/emscripten-tests/tests/emtests/test_float32_precise.rs diff --git a/lib/emscripten/tests/emtests/test_float_builtins.rs b/lib/emscripten-tests/tests/emtests/test_float_builtins.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_float_builtins.rs rename to lib/emscripten-tests/tests/emtests/test_float_builtins.rs diff --git a/lib/emscripten/tests/emtests/test_frexp.rs b/lib/emscripten-tests/tests/emtests/test_frexp.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_frexp.rs rename to lib/emscripten-tests/tests/emtests/test_frexp.rs diff --git a/lib/emscripten/tests/emtests/test_funcptr.rs b/lib/emscripten-tests/tests/emtests/test_funcptr.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_funcptr.rs rename to lib/emscripten-tests/tests/emtests/test_funcptr.rs diff --git a/lib/emscripten/tests/emtests/test_funcptr_namecollide.rs b/lib/emscripten-tests/tests/emtests/test_funcptr_namecollide.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_funcptr_namecollide.rs rename to lib/emscripten-tests/tests/emtests/test_funcptr_namecollide.rs diff --git a/lib/emscripten/tests/emtests/test_funcptrfunc.rs b/lib/emscripten-tests/tests/emtests/test_funcptrfunc.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_funcptrfunc.rs rename to lib/emscripten-tests/tests/emtests/test_funcptrfunc.rs diff --git a/lib/emscripten/tests/emtests/test_funcs.rs b/lib/emscripten-tests/tests/emtests/test_funcs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_funcs.rs rename to lib/emscripten-tests/tests/emtests/test_funcs.rs diff --git a/lib/emscripten/tests/emtests/test_functionpointer_libfunc_varargs.rs b/lib/emscripten-tests/tests/emtests/test_functionpointer_libfunc_varargs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_functionpointer_libfunc_varargs.rs rename to lib/emscripten-tests/tests/emtests/test_functionpointer_libfunc_varargs.rs diff --git a/lib/emscripten/tests/emtests/test_fwrite_0.rs b/lib/emscripten-tests/tests/emtests/test_fwrite_0.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_fwrite_0.rs rename to lib/emscripten-tests/tests/emtests/test_fwrite_0.rs diff --git a/lib/emscripten/tests/emtests/test_getcwd.rs b/lib/emscripten-tests/tests/emtests/test_getcwd.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_getcwd.rs rename to lib/emscripten-tests/tests/emtests/test_getcwd.rs diff --git a/lib/emscripten/tests/emtests/test_getgep.rs b/lib/emscripten-tests/tests/emtests/test_getgep.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_getgep.rs rename to lib/emscripten-tests/tests/emtests/test_getgep.rs diff --git a/lib/emscripten/tests/emtests/test_getloadavg.rs b/lib/emscripten-tests/tests/emtests/test_getloadavg.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_getloadavg.rs rename to lib/emscripten-tests/tests/emtests/test_getloadavg.rs diff --git a/lib/emscripten/tests/emtests/test_getopt.rs b/lib/emscripten-tests/tests/emtests/test_getopt.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_getopt.rs rename to lib/emscripten-tests/tests/emtests/test_getopt.rs diff --git a/lib/emscripten/tests/emtests/test_getopt_long.rs b/lib/emscripten-tests/tests/emtests/test_getopt_long.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_getopt_long.rs rename to lib/emscripten-tests/tests/emtests/test_getopt_long.rs diff --git a/lib/emscripten/tests/emtests/test_globaldoubles.rs b/lib/emscripten-tests/tests/emtests/test_globaldoubles.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_globaldoubles.rs rename to lib/emscripten-tests/tests/emtests/test_globaldoubles.rs diff --git a/lib/emscripten/tests/emtests/test_globals.rs b/lib/emscripten-tests/tests/emtests/test_globals.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_globals.rs rename to lib/emscripten-tests/tests/emtests/test_globals.rs diff --git a/lib/emscripten/tests/emtests/test_gmtime.rs b/lib/emscripten-tests/tests/emtests/test_gmtime.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_gmtime.rs rename to lib/emscripten-tests/tests/emtests/test_gmtime.rs diff --git a/lib/emscripten/tests/emtests/test_hello_world.rs b/lib/emscripten-tests/tests/emtests/test_hello_world.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_hello_world.rs rename to lib/emscripten-tests/tests/emtests/test_hello_world.rs diff --git a/lib/emscripten/tests/emtests/test_i16_emcc_intrinsic.rs b/lib/emscripten-tests/tests/emtests/test_i16_emcc_intrinsic.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i16_emcc_intrinsic.rs rename to lib/emscripten-tests/tests/emtests/test_i16_emcc_intrinsic.rs diff --git a/lib/emscripten/tests/emtests/test_i32_mul_precise.rs b/lib/emscripten-tests/tests/emtests/test_i32_mul_precise.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i32_mul_precise.rs rename to lib/emscripten-tests/tests/emtests/test_i32_mul_precise.rs diff --git a/lib/emscripten/tests/emtests/test_i64.rs b/lib/emscripten-tests/tests/emtests/test_i64.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64.rs rename to lib/emscripten-tests/tests/emtests/test_i64.rs diff --git a/lib/emscripten/tests/emtests/test_i64_4.rs b/lib/emscripten-tests/tests/emtests/test_i64_4.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_4.rs rename to lib/emscripten-tests/tests/emtests/test_i64_4.rs diff --git a/lib/emscripten/tests/emtests/test_i64_7z.rs b/lib/emscripten-tests/tests/emtests/test_i64_7z.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_7z.rs rename to lib/emscripten-tests/tests/emtests/test_i64_7z.rs diff --git a/lib/emscripten/tests/emtests/test_i64_cmp2.rs b/lib/emscripten-tests/tests/emtests/test_i64_cmp2.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_cmp2.rs rename to lib/emscripten-tests/tests/emtests/test_i64_cmp2.rs diff --git a/lib/emscripten/tests/emtests/test_i64_i16.rs b/lib/emscripten-tests/tests/emtests/test_i64_i16.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_i16.rs rename to lib/emscripten-tests/tests/emtests/test_i64_i16.rs diff --git a/lib/emscripten/tests/emtests/test_i64_llabs.rs b/lib/emscripten-tests/tests/emtests/test_i64_llabs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_llabs.rs rename to lib/emscripten-tests/tests/emtests/test_i64_llabs.rs diff --git a/lib/emscripten/tests/emtests/test_i64_precise.rs b/lib/emscripten-tests/tests/emtests/test_i64_precise.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_precise.rs rename to lib/emscripten-tests/tests/emtests/test_i64_precise.rs diff --git a/lib/emscripten/tests/emtests/test_i64_precise_needed.rs b/lib/emscripten-tests/tests/emtests/test_i64_precise_needed.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_precise_needed.rs rename to lib/emscripten-tests/tests/emtests/test_i64_precise_needed.rs diff --git a/lib/emscripten/tests/emtests/test_i64_precise_unneeded.rs b/lib/emscripten-tests/tests/emtests/test_i64_precise_unneeded.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_precise_unneeded.rs rename to lib/emscripten-tests/tests/emtests/test_i64_precise_unneeded.rs diff --git a/lib/emscripten/tests/emtests/test_i64_qdouble.rs b/lib/emscripten-tests/tests/emtests/test_i64_qdouble.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_qdouble.rs rename to lib/emscripten-tests/tests/emtests/test_i64_qdouble.rs diff --git a/lib/emscripten/tests/emtests/test_i64_umul.rs b/lib/emscripten-tests/tests/emtests/test_i64_umul.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_umul.rs rename to lib/emscripten-tests/tests/emtests/test_i64_umul.rs diff --git a/lib/emscripten/tests/emtests/test_i64_varargs.rs b/lib/emscripten-tests/tests/emtests/test_i64_varargs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_varargs.rs rename to lib/emscripten-tests/tests/emtests/test_i64_varargs.rs diff --git a/lib/emscripten/tests/emtests/test_i64_zextneg.rs b/lib/emscripten-tests/tests/emtests/test_i64_zextneg.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_i64_zextneg.rs rename to lib/emscripten-tests/tests/emtests/test_i64_zextneg.rs diff --git a/lib/emscripten/tests/emtests/test_if.rs b/lib/emscripten-tests/tests/emtests/test_if.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_if.rs rename to lib/emscripten-tests/tests/emtests/test_if.rs diff --git a/lib/emscripten/tests/emtests/test_if_else.rs b/lib/emscripten-tests/tests/emtests/test_if_else.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_if_else.rs rename to lib/emscripten-tests/tests/emtests/test_if_else.rs diff --git a/lib/emscripten/tests/emtests/test_indirectbr.rs b/lib/emscripten-tests/tests/emtests/test_indirectbr.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_indirectbr.rs rename to lib/emscripten-tests/tests/emtests/test_indirectbr.rs diff --git a/lib/emscripten/tests/emtests/test_indirectbr_many.rs b/lib/emscripten-tests/tests/emtests/test_indirectbr_many.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_indirectbr_many.rs rename to lib/emscripten-tests/tests/emtests/test_indirectbr_many.rs diff --git a/lib/emscripten/tests/emtests/test_isnan.rs b/lib/emscripten-tests/tests/emtests/test_isnan.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_isnan.rs rename to lib/emscripten-tests/tests/emtests/test_isnan.rs diff --git a/lib/emscripten/tests/emtests/test_libcextra.rs b/lib/emscripten-tests/tests/emtests/test_libcextra.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_libcextra.rs rename to lib/emscripten-tests/tests/emtests/test_libcextra.rs diff --git a/lib/emscripten/tests/emtests/test_libgen.rs b/lib/emscripten-tests/tests/emtests/test_libgen.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_libgen.rs rename to lib/emscripten-tests/tests/emtests/test_libgen.rs diff --git a/lib/emscripten/tests/emtests/test_literal_negative_zero.rs b/lib/emscripten-tests/tests/emtests/test_literal_negative_zero.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_literal_negative_zero.rs rename to lib/emscripten-tests/tests/emtests/test_literal_negative_zero.rs diff --git a/lib/emscripten/tests/emtests/test_llrint.rs b/lib/emscripten-tests/tests/emtests/test_llrint.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_llrint.rs rename to lib/emscripten-tests/tests/emtests/test_llrint.rs diff --git a/lib/emscripten/tests/emtests/test_llvm_fabs.rs b/lib/emscripten-tests/tests/emtests/test_llvm_fabs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_llvm_fabs.rs rename to lib/emscripten-tests/tests/emtests/test_llvm_fabs.rs diff --git a/lib/emscripten/tests/emtests/test_llvm_intrinsics.rs b/lib/emscripten-tests/tests/emtests/test_llvm_intrinsics.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_llvm_intrinsics.rs rename to lib/emscripten-tests/tests/emtests/test_llvm_intrinsics.rs diff --git a/lib/emscripten/tests/emtests/test_llvmswitch.rs b/lib/emscripten-tests/tests/emtests/test_llvmswitch.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_llvmswitch.rs rename to lib/emscripten-tests/tests/emtests/test_llvmswitch.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp.rs b/lib/emscripten-tests/tests/emtests/test_longjmp.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp2.rs b/lib/emscripten-tests/tests/emtests/test_longjmp2.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp2.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp2.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp3.rs b/lib/emscripten-tests/tests/emtests/test_longjmp3.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp3.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp3.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp4.rs b/lib/emscripten-tests/tests/emtests/test_longjmp4.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp4.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp4.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp_exc.rs b/lib/emscripten-tests/tests/emtests/test_longjmp_exc.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp_exc.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp_exc.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp_funcptr.rs b/lib/emscripten-tests/tests/emtests/test_longjmp_funcptr.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp_funcptr.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp_funcptr.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp_repeat.rs b/lib/emscripten-tests/tests/emtests/test_longjmp_repeat.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp_repeat.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp_repeat.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp_stacked.rs b/lib/emscripten-tests/tests/emtests/test_longjmp_stacked.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp_stacked.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp_stacked.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp_throw.rs b/lib/emscripten-tests/tests/emtests/test_longjmp_throw.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp_throw.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp_throw.rs diff --git a/lib/emscripten/tests/emtests/test_longjmp_unwind.rs b/lib/emscripten-tests/tests/emtests/test_longjmp_unwind.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_longjmp_unwind.rs rename to lib/emscripten-tests/tests/emtests/test_longjmp_unwind.rs diff --git a/lib/emscripten/tests/emtests/test_loop.rs b/lib/emscripten-tests/tests/emtests/test_loop.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_loop.rs rename to lib/emscripten-tests/tests/emtests/test_loop.rs diff --git a/lib/emscripten/tests/emtests/test_lower_intrinsics.rs b/lib/emscripten-tests/tests/emtests/test_lower_intrinsics.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_lower_intrinsics.rs rename to lib/emscripten-tests/tests/emtests/test_lower_intrinsics.rs diff --git a/lib/emscripten/tests/emtests/test_main_thread_async_em_asm.rs b/lib/emscripten-tests/tests/emtests/test_main_thread_async_em_asm.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_main_thread_async_em_asm.rs rename to lib/emscripten-tests/tests/emtests/test_main_thread_async_em_asm.rs diff --git a/lib/emscripten/tests/emtests/test_mainenv.rs b/lib/emscripten-tests/tests/emtests/test_mainenv.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_mainenv.rs rename to lib/emscripten-tests/tests/emtests/test_mainenv.rs diff --git a/lib/emscripten/tests/emtests/test_mathfuncptr.rs b/lib/emscripten-tests/tests/emtests/test_mathfuncptr.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_mathfuncptr.rs rename to lib/emscripten-tests/tests/emtests/test_mathfuncptr.rs diff --git a/lib/emscripten/tests/emtests/test_memcpy2.rs b/lib/emscripten-tests/tests/emtests/test_memcpy2.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_memcpy2.rs rename to lib/emscripten-tests/tests/emtests/test_memcpy2.rs diff --git a/lib/emscripten/tests/emtests/test_memcpy3.rs b/lib/emscripten-tests/tests/emtests/test_memcpy3.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_memcpy3.rs rename to lib/emscripten-tests/tests/emtests/test_memcpy3.rs diff --git a/lib/emscripten/tests/emtests/test_memcpy_memcmp.rs b/lib/emscripten-tests/tests/emtests/test_memcpy_memcmp.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_memcpy_memcmp.rs rename to lib/emscripten-tests/tests/emtests/test_memcpy_memcmp.rs diff --git a/lib/emscripten/tests/emtests/test_memmove.rs b/lib/emscripten-tests/tests/emtests/test_memmove.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_memmove.rs rename to lib/emscripten-tests/tests/emtests/test_memmove.rs diff --git a/lib/emscripten/tests/emtests/test_memmove2.rs b/lib/emscripten-tests/tests/emtests/test_memmove2.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_memmove2.rs rename to lib/emscripten-tests/tests/emtests/test_memmove2.rs diff --git a/lib/emscripten/tests/emtests/test_memmove3.rs b/lib/emscripten-tests/tests/emtests/test_memmove3.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_memmove3.rs rename to lib/emscripten-tests/tests/emtests/test_memmove3.rs diff --git a/lib/emscripten/tests/emtests/test_memset.rs b/lib/emscripten-tests/tests/emtests/test_memset.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_memset.rs rename to lib/emscripten-tests/tests/emtests/test_memset.rs diff --git a/lib/emscripten/tests/emtests/test_mmap.rs b/lib/emscripten-tests/tests/emtests/test_mmap.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_mmap.rs rename to lib/emscripten-tests/tests/emtests/test_mmap.rs diff --git a/lib/emscripten/tests/emtests/test_negative_zero.rs b/lib/emscripten-tests/tests/emtests/test_negative_zero.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_negative_zero.rs rename to lib/emscripten-tests/tests/emtests/test_negative_zero.rs diff --git a/lib/emscripten/tests/emtests/test_nested_struct_varargs.rs b/lib/emscripten-tests/tests/emtests/test_nested_struct_varargs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_nested_struct_varargs.rs rename to lib/emscripten-tests/tests/emtests/test_nested_struct_varargs.rs diff --git a/lib/emscripten/tests/emtests/test_nl_types.rs b/lib/emscripten-tests/tests/emtests/test_nl_types.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_nl_types.rs rename to lib/emscripten-tests/tests/emtests/test_nl_types.rs diff --git a/lib/emscripten/tests/emtests/test_perrar.rs b/lib/emscripten-tests/tests/emtests/test_perrar.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_perrar.rs rename to lib/emscripten-tests/tests/emtests/test_perrar.rs diff --git a/lib/emscripten/tests/emtests/test_phiundef.rs b/lib/emscripten-tests/tests/emtests/test_phiundef.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_phiundef.rs rename to lib/emscripten-tests/tests/emtests/test_phiundef.rs diff --git a/lib/emscripten/tests/emtests/test_pipe.rs b/lib/emscripten-tests/tests/emtests/test_pipe.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_pipe.rs rename to lib/emscripten-tests/tests/emtests/test_pipe.rs diff --git a/lib/emscripten/tests/emtests/test_poll.rs b/lib/emscripten-tests/tests/emtests/test_poll.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_poll.rs rename to lib/emscripten-tests/tests/emtests/test_poll.rs diff --git a/lib/emscripten/tests/emtests/test_posixtime.rs b/lib/emscripten-tests/tests/emtests/test_posixtime.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_posixtime.rs rename to lib/emscripten-tests/tests/emtests/test_posixtime.rs diff --git a/lib/emscripten/tests/emtests/test_printf_2.rs b/lib/emscripten-tests/tests/emtests/test_printf_2.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_printf_2.rs rename to lib/emscripten-tests/tests/emtests/test_printf_2.rs diff --git a/lib/emscripten/tests/emtests/test_printf_more.rs b/lib/emscripten-tests/tests/emtests/test_printf_more.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_printf_more.rs rename to lib/emscripten-tests/tests/emtests/test_printf_more.rs diff --git a/lib/emscripten/tests/emtests/test_regex.rs b/lib/emscripten-tests/tests/emtests/test_regex.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_regex.rs rename to lib/emscripten-tests/tests/emtests/test_regex.rs diff --git a/lib/emscripten/tests/emtests/test_relocatable_void_function.rs b/lib/emscripten-tests/tests/emtests/test_relocatable_void_function.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_relocatable_void_function.rs rename to lib/emscripten-tests/tests/emtests/test_relocatable_void_function.rs diff --git a/lib/emscripten/tests/emtests/test_rounding.rs b/lib/emscripten-tests/tests/emtests/test_rounding.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_rounding.rs rename to lib/emscripten-tests/tests/emtests/test_rounding.rs diff --git a/lib/emscripten/tests/emtests/test_set_align.rs b/lib/emscripten-tests/tests/emtests/test_set_align.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_set_align.rs rename to lib/emscripten-tests/tests/emtests/test_set_align.rs diff --git a/lib/emscripten/tests/emtests/test_siglongjmp.rs b/lib/emscripten-tests/tests/emtests/test_siglongjmp.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_siglongjmp.rs rename to lib/emscripten-tests/tests/emtests/test_siglongjmp.rs diff --git a/lib/emscripten/tests/emtests/test_sintvars.rs b/lib/emscripten-tests/tests/emtests/test_sintvars.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sintvars.rs rename to lib/emscripten-tests/tests/emtests/test_sintvars.rs diff --git a/lib/emscripten/tests/emtests/test_sizeof.rs b/lib/emscripten-tests/tests/emtests/test_sizeof.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sizeof.rs rename to lib/emscripten-tests/tests/emtests/test_sizeof.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf.rs b/lib/emscripten-tests/tests/emtests/test_sscanf.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_3.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_3.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_3.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_3.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_4.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_4.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_4.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_4.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_5.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_5.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_5.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_5.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_6.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_6.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_6.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_6.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_caps.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_caps.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_caps.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_caps.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_float.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_float.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_float.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_float.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_hex.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_hex.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_hex.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_hex.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_n.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_n.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_n.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_n.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_other_whitespace.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_other_whitespace.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_other_whitespace.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_other_whitespace.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_skip.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_skip.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_skip.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_skip.rs diff --git a/lib/emscripten/tests/emtests/test_sscanf_whitespace.rs b/lib/emscripten-tests/tests/emtests/test_sscanf_whitespace.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_sscanf_whitespace.rs rename to lib/emscripten-tests/tests/emtests/test_sscanf_whitespace.rs diff --git a/lib/emscripten/tests/emtests/test_stack_varargs.rs b/lib/emscripten-tests/tests/emtests/test_stack_varargs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_stack_varargs.rs rename to lib/emscripten-tests/tests/emtests/test_stack_varargs.rs diff --git a/lib/emscripten/tests/emtests/test_stack_void.rs b/lib/emscripten-tests/tests/emtests/test_stack_void.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_stack_void.rs rename to lib/emscripten-tests/tests/emtests/test_stack_void.rs diff --git a/lib/emscripten/tests/emtests/test_statvfs.rs b/lib/emscripten-tests/tests/emtests/test_statvfs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_statvfs.rs rename to lib/emscripten-tests/tests/emtests/test_statvfs.rs diff --git a/lib/emscripten/tests/emtests/test_std_cout_new.rs b/lib/emscripten-tests/tests/emtests/test_std_cout_new.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_std_cout_new.rs rename to lib/emscripten-tests/tests/emtests/test_std_cout_new.rs diff --git a/lib/emscripten/tests/emtests/test_strcasecmp.rs b/lib/emscripten-tests/tests/emtests/test_strcasecmp.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strcasecmp.rs rename to lib/emscripten-tests/tests/emtests/test_strcasecmp.rs diff --git a/lib/emscripten/tests/emtests/test_strcmp_uni.rs b/lib/emscripten-tests/tests/emtests/test_strcmp_uni.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strcmp_uni.rs rename to lib/emscripten-tests/tests/emtests/test_strcmp_uni.rs diff --git a/lib/emscripten/tests/emtests/test_strftime.rs b/lib/emscripten-tests/tests/emtests/test_strftime.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strftime.rs rename to lib/emscripten-tests/tests/emtests/test_strftime.rs diff --git a/lib/emscripten/tests/emtests/test_strings.rs b/lib/emscripten-tests/tests/emtests/test_strings.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strings.rs rename to lib/emscripten-tests/tests/emtests/test_strings.rs diff --git a/lib/emscripten/tests/emtests/test_strndup.rs b/lib/emscripten-tests/tests/emtests/test_strndup.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strndup.rs rename to lib/emscripten-tests/tests/emtests/test_strndup.rs diff --git a/lib/emscripten/tests/emtests/test_strptime_days.rs b/lib/emscripten-tests/tests/emtests/test_strptime_days.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strptime_days.rs rename to lib/emscripten-tests/tests/emtests/test_strptime_days.rs diff --git a/lib/emscripten/tests/emtests/test_strptime_reentrant.rs b/lib/emscripten-tests/tests/emtests/test_strptime_reentrant.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strptime_reentrant.rs rename to lib/emscripten-tests/tests/emtests/test_strptime_reentrant.rs diff --git a/lib/emscripten/tests/emtests/test_strstr.rs b/lib/emscripten-tests/tests/emtests/test_strstr.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strstr.rs rename to lib/emscripten-tests/tests/emtests/test_strstr.rs diff --git a/lib/emscripten/tests/emtests/test_strtod.rs b/lib/emscripten-tests/tests/emtests/test_strtod.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtod.rs rename to lib/emscripten-tests/tests/emtests/test_strtod.rs diff --git a/lib/emscripten/tests/emtests/test_strtok.rs b/lib/emscripten-tests/tests/emtests/test_strtok.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtok.rs rename to lib/emscripten-tests/tests/emtests/test_strtok.rs diff --git a/lib/emscripten/tests/emtests/test_strtol_bin.rs b/lib/emscripten-tests/tests/emtests/test_strtol_bin.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtol_bin.rs rename to lib/emscripten-tests/tests/emtests/test_strtol_bin.rs diff --git a/lib/emscripten/tests/emtests/test_strtol_dec.rs b/lib/emscripten-tests/tests/emtests/test_strtol_dec.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtol_dec.rs rename to lib/emscripten-tests/tests/emtests/test_strtol_dec.rs diff --git a/lib/emscripten/tests/emtests/test_strtol_hex.rs b/lib/emscripten-tests/tests/emtests/test_strtol_hex.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtol_hex.rs rename to lib/emscripten-tests/tests/emtests/test_strtol_hex.rs diff --git a/lib/emscripten/tests/emtests/test_strtol_oct.rs b/lib/emscripten-tests/tests/emtests/test_strtol_oct.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtol_oct.rs rename to lib/emscripten-tests/tests/emtests/test_strtol_oct.rs diff --git a/lib/emscripten/tests/emtests/test_strtold.rs b/lib/emscripten-tests/tests/emtests/test_strtold.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtold.rs rename to lib/emscripten-tests/tests/emtests/test_strtold.rs diff --git a/lib/emscripten/tests/emtests/test_strtoll_bin.rs b/lib/emscripten-tests/tests/emtests/test_strtoll_bin.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtoll_bin.rs rename to lib/emscripten-tests/tests/emtests/test_strtoll_bin.rs diff --git a/lib/emscripten/tests/emtests/test_strtoll_dec.rs b/lib/emscripten-tests/tests/emtests/test_strtoll_dec.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtoll_dec.rs rename to lib/emscripten-tests/tests/emtests/test_strtoll_dec.rs diff --git a/lib/emscripten/tests/emtests/test_strtoll_hex.rs b/lib/emscripten-tests/tests/emtests/test_strtoll_hex.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtoll_hex.rs rename to lib/emscripten-tests/tests/emtests/test_strtoll_hex.rs diff --git a/lib/emscripten/tests/emtests/test_strtoll_oct.rs b/lib/emscripten-tests/tests/emtests/test_strtoll_oct.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_strtoll_oct.rs rename to lib/emscripten-tests/tests/emtests/test_strtoll_oct.rs diff --git a/lib/emscripten/tests/emtests/test_struct_varargs.rs b/lib/emscripten-tests/tests/emtests/test_struct_varargs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_struct_varargs.rs rename to lib/emscripten-tests/tests/emtests/test_struct_varargs.rs diff --git a/lib/emscripten/tests/emtests/test_time_c.rs b/lib/emscripten-tests/tests/emtests/test_time_c.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_time_c.rs rename to lib/emscripten-tests/tests/emtests/test_time_c.rs diff --git a/lib/emscripten/tests/emtests/test_tracing.rs b/lib/emscripten-tests/tests/emtests/test_tracing.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_tracing.rs rename to lib/emscripten-tests/tests/emtests/test_tracing.rs diff --git a/lib/emscripten/tests/emtests/test_transtrcase.rs b/lib/emscripten-tests/tests/emtests/test_transtrcase.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_transtrcase.rs rename to lib/emscripten-tests/tests/emtests/test_transtrcase.rs diff --git a/lib/emscripten/tests/emtests/test_trickystring.rs b/lib/emscripten-tests/tests/emtests/test_trickystring.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_trickystring.rs rename to lib/emscripten-tests/tests/emtests/test_trickystring.rs diff --git a/lib/emscripten/tests/emtests/test_uname.rs b/lib/emscripten-tests/tests/emtests/test_uname.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_uname.rs rename to lib/emscripten-tests/tests/emtests/test_uname.rs diff --git a/lib/emscripten/tests/emtests/test_unary_literal.rs b/lib/emscripten-tests/tests/emtests/test_unary_literal.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_unary_literal.rs rename to lib/emscripten-tests/tests/emtests/test_unary_literal.rs diff --git a/lib/emscripten/tests/emtests/test_utf.rs b/lib/emscripten-tests/tests/emtests/test_utf.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_utf.rs rename to lib/emscripten-tests/tests/emtests/test_utf.rs diff --git a/lib/emscripten/tests/emtests/test_varargs.rs b/lib/emscripten-tests/tests/emtests/test_varargs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_varargs.rs rename to lib/emscripten-tests/tests/emtests/test_varargs.rs diff --git a/lib/emscripten/tests/emtests/test_varargs_multi.rs b/lib/emscripten-tests/tests/emtests/test_varargs_multi.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_varargs_multi.rs rename to lib/emscripten-tests/tests/emtests/test_varargs_multi.rs diff --git a/lib/emscripten/tests/emtests/test_vfs.rs b/lib/emscripten-tests/tests/emtests/test_vfs.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_vfs.rs rename to lib/emscripten-tests/tests/emtests/test_vfs.rs diff --git a/lib/emscripten/tests/emtests/test_vprintf.rs b/lib/emscripten-tests/tests/emtests/test_vprintf.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_vprintf.rs rename to lib/emscripten-tests/tests/emtests/test_vprintf.rs diff --git a/lib/emscripten/tests/emtests/test_vsnprintf.rs b/lib/emscripten-tests/tests/emtests/test_vsnprintf.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_vsnprintf.rs rename to lib/emscripten-tests/tests/emtests/test_vsnprintf.rs diff --git a/lib/emscripten/tests/emtests/test_wprintf.rs b/lib/emscripten-tests/tests/emtests/test_wprintf.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_wprintf.rs rename to lib/emscripten-tests/tests/emtests/test_wprintf.rs diff --git a/lib/emscripten/tests/emtests/test_write_stdout_fileno.rs b/lib/emscripten-tests/tests/emtests/test_write_stdout_fileno.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_write_stdout_fileno.rs rename to lib/emscripten-tests/tests/emtests/test_write_stdout_fileno.rs diff --git a/lib/emscripten/tests/emtests/test_zero_multiplication.rs b/lib/emscripten-tests/tests/emtests/test_zero_multiplication.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_zero_multiplication.rs rename to lib/emscripten-tests/tests/emtests/test_zero_multiplication.rs diff --git a/lib/emscripten/tests/emtests/test_zerodiv.rs b/lib/emscripten-tests/tests/emtests/test_zerodiv.rs similarity index 100% rename from lib/emscripten/tests/emtests/test_zerodiv.rs rename to lib/emscripten-tests/tests/emtests/test_zerodiv.rs diff --git a/lib/emscripten/Cargo.toml b/lib/emscripten/Cargo.toml index bd443395a..995325595 100644 --- a/lib/emscripten/Cargo.toml +++ b/lib/emscripten/Cargo.toml @@ -6,7 +6,6 @@ license = "MIT" authors = ["The Wasmer Engineering Team "] repository = "https://github.com/wasmerio/wasmer" edition = "2018" -build = "build/mod.rs" [dependencies] byteorder = "1" @@ -14,23 +13,10 @@ hashbrown = "0.1" lazy_static = "1.2.0" libc = "0.2.49" time = "0.1.41" -wasmer-clif-backend = { path = "../clif-backend", version = "0.5.4" } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.4", optional = true } wasmer-runtime-core = { path = "../runtime-core", version = "0.5.4" } -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.4", optional = true } [target.'cfg(windows)'.dependencies] rand = "0.6" -[dev-dependencies] -wabt = "0.7.2" -wasmer-dev-utils = { path = "../dev-utils", version = "0.5.4"} - -[build-dependencies] -glob = "0.2.11" - [features] -clif = [] -llvm = ["wasmer-llvm-backend"] -singlepass = ["wasmer-singlepass-backend"] -debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"] +debug = ["wasmer-runtime-core/debug"] \ No newline at end of file diff --git a/lib/emscripten/src/utils.rs b/lib/emscripten/src/utils.rs index e3370fdad..4bf8fe2d3 100644 --- a/lib/emscripten/src/utils.rs +++ b/lib/emscripten/src/utils.rs @@ -263,57 +263,3 @@ pub fn get_current_directory(ctx: &mut Ctx) -> Option { }) .ok() } - -#[cfg(test)] -mod tests { - use super::is_emscripten_module; - use std::sync::Arc; - use wabt::wat2wasm; - use wasmer_runtime_core::backend::Compiler; - use wasmer_runtime_core::compile_with; - - #[cfg(feature = "clif")] - fn get_compiler() -> impl Compiler { - use wasmer_clif_backend::CraneliftCompiler; - CraneliftCompiler::new() - } - - #[cfg(feature = "llvm")] - fn get_compiler() -> impl Compiler { - use wasmer_llvm_backend::LLVMCompiler; - LLVMCompiler::new() - } - - #[cfg(feature = "singlepass")] - fn get_compiler() -> impl Compiler { - use wasmer_singlepass_backend::SinglePassCompiler; - SinglePassCompiler::new() - } - - #[cfg(not(any(feature = "llvm", feature = "clif", feature = "singlepass")))] - fn get_compiler() -> impl Compiler { - panic!("compiler not specified, activate a compiler via features"); - use wasmer_clif_backend::CraneliftCompiler; - CraneliftCompiler::new() - } - - #[test] - fn should_detect_emscripten_files() { - const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_true.wast"); - let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm"); - let module = - compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled"); - let module = Arc::new(module); - assert!(is_emscripten_module(&module)); - } - - #[test] - fn should_detect_non_emscripten_files() { - const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_false.wast"); - let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm"); - let module = - compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled"); - let module = Arc::new(module); - assert!(!is_emscripten_module(&module)); - } -} diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml index 0cba94240..936b66e16 100644 --- a/lib/runtime-core/Cargo.toml +++ b/lib/runtime-core/Cargo.toml @@ -54,3 +54,6 @@ cc = "1.0" [features] debug = [] trace = ["debug"] +# backend flags used in conditional compilation of Backend::variants +"backend:singlepass" = [] +"backend:llvm" = [] diff --git a/lib/runtime-core/src/backend.rs b/lib/runtime-core/src/backend.rs index ed8733bde..2c51cb576 100644 --- a/lib/runtime-core/src/backend.rs +++ b/lib/runtime-core/src/backend.rs @@ -29,6 +29,62 @@ pub enum Backend { LLVM, } +impl Backend { + pub fn variants() -> &'static [&'static str] { + &[ + "cranelift", + #[cfg(feature = "backend:singlepass")] + "singlepass", + #[cfg(feature = "backend:llvm")] + "llvm", + ] + } + + /// stable string representation of the backend + /// can be used as part of a cache key, for example + pub fn to_string(&self) -> &'static str { + match self { + Backend::Cranelift => "cranelift", + Backend::Singlepass => "singlepass", + Backend::LLVM => "llvm", + } + } +} + +impl Default for Backend { + fn default() -> Self { + Backend::Cranelift + } +} + +impl std::str::FromStr for Backend { + type Err = String; + fn from_str(s: &str) -> Result { + match s.to_lowercase().as_str() { + "singlepass" => Ok(Backend::Singlepass), + "cranelift" => Ok(Backend::Cranelift), + "llvm" => Ok(Backend::LLVM), + _ => Err(format!("The backend {} doesn't exist", s)), + } + } +} + +#[cfg(test)] +mod backend_test { + use super::*; + use std::str::FromStr; + + #[test] + fn str_repr_matches() { + // if this test breaks, think hard about why it's breaking + // can we avoid having these be different? + + for &backend in &[Backend::Cranelift, Backend::LLVM, Backend::Singlepass] { + assert_eq!(backend, Backend::from_str(backend.to_string()).unwrap()); + } + } +} + /// This type cannot be constructed from /// outside the runtime crate. pub struct Token { diff --git a/lib/runtime-core/src/cache.rs b/lib/runtime-core/src/cache.rs index 93e14b0f9..18c571b00 100644 --- a/lib/runtime-core/src/cache.rs +++ b/lib/runtime-core/src/cache.rs @@ -1,4 +1,5 @@ use crate::{ + backend::Backend, module::{Module, ModuleInfo}, sys::Memory, }; @@ -62,6 +63,30 @@ impl WasmHash { hex::encode(&self.into_array() as &[u8]) } + /// Create hash from hexadecimal representation + pub fn decode(hex_str: &str) -> Result { + let bytes = hex::decode(hex_str).map_err(|e| { + Error::DeserializeError(format!( + "Could not decode prehashed key as hexadecimal: {}", + e + )) + })?; + if bytes.len() != 64 { + return Err(Error::DeserializeError( + "Prehashed keys must deserialze into exactly 64 bytes".to_string(), + )); + } + use std::convert::TryInto; + Ok(WasmHash( + bytes[0..32].try_into().map_err(|e| { + Error::DeserializeError(format!("Could not get first 32 bytes: {}", e)) + })?, + bytes[32..64].try_into().map_err(|e| { + Error::DeserializeError(format!("Could not get last 32 bytes: {}", e)) + })?, + )) + } + pub(crate) fn into_array(self) -> [u8; 64] { let mut total = [0u8; 64]; total[0..32].copy_from_slice(&self.0); @@ -204,7 +229,11 @@ pub trait Cache { type LoadError: fmt::Debug; type StoreError: fmt::Debug; + /// loads a module using the default `Backend` fn load(&self, key: WasmHash) -> Result; + /// loads a cached module using a specific `Backend` + fn load_with_backend(&self, key: WasmHash, backend: Backend) + -> Result; fn store(&mut self, key: WasmHash, module: Module) -> Result<(), Self::StoreError>; } diff --git a/lib/runtime/src/cache.rs b/lib/runtime/src/cache.rs index b6d1d779b..fdb0d58c8 100644 --- a/lib/runtime/src/cache.rs +++ b/lib/runtime/src/cache.rs @@ -7,7 +7,10 @@ use std::{ }; use wasmer_runtime_core::cache::Error as CacheError; -pub use wasmer_runtime_core::cache::{Artifact, Cache, WasmHash, WASMER_VERSION_HASH}; +pub use wasmer_runtime_core::{ + backend::Backend, + cache::{Artifact, Cache, WasmHash, WASMER_VERSION_HASH}, +}; /// Representation of a directory that contains compiled wasm artifacts. /// @@ -87,8 +90,13 @@ impl Cache for FileSystemCache { type StoreError = CacheError; fn load(&self, key: WasmHash) -> Result { + self.load_with_backend(key, Backend::default()) + } + + fn load_with_backend(&self, key: WasmHash, backend: Backend) -> Result { let filename = key.encode(); let mut new_path_buf = self.path.clone(); + new_path_buf.push(backend.to_string()); new_path_buf.push(filename); let file = File::open(new_path_buf)?; let mmap = unsafe { Mmap::map(&file)? }; @@ -101,12 +109,15 @@ impl Cache for FileSystemCache { fn store(&mut self, key: WasmHash, module: Module) -> Result<(), CacheError> { let filename = key.encode(); + let backend_str = module.info().backend.to_string(); let mut new_path_buf = self.path.clone(); - new_path_buf.push(filename); + new_path_buf.push(backend_str); let serialized_cache = module.cache()?; let buffer = serialized_cache.serialize()?; + std::fs::create_dir_all(&new_path_buf)?; + new_path_buf.push(filename); let mut file = File::create(new_path_buf)?; file.write_all(&buffer)?; diff --git a/lib/wasi-tests/Cargo.toml b/lib/wasi-tests/Cargo.toml new file mode 100644 index 000000000..45cd69dfd --- /dev/null +++ b/lib/wasi-tests/Cargo.toml @@ -0,0 +1,29 @@ +[package] +name = "wasmer-wasi-tests" +version = "0.5.4" +description = "Tests for our WASI implementation" +license = "MIT" +authors = ["The Wasmer Engineering Team "] +edition = "2018" +publish = false +build = "build/mod.rs" + +[dependencies] +wasmer-runtime-core = { path = "../runtime-core", version = "0.5.4" } +wasmer-wasi = { path = "../wasi", version = "0.5.4" } +# hack to get tests to work +wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.4", optional = true } +wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.4", optional = true } + + +[build-dependencies] +glob = "0.2.11" + +[dev-dependencies] +wasmer-clif-backend = { path = "../clif-backend", version = "0.5.4" } +wasmer-dev-utils = { path = "../dev-utils", version = "0.5.4"} + +[features] +clif = [] +singlepass = ["wasmer-singlepass-backend"] +llvm = ["wasmer-llvm-backend"] diff --git a/lib/wasi/build/mod.rs b/lib/wasi-tests/build/mod.rs similarity index 100% rename from lib/wasi/build/mod.rs rename to lib/wasi-tests/build/mod.rs diff --git a/lib/wasi/build/wasitests.rs b/lib/wasi-tests/build/wasitests.rs similarity index 100% rename from lib/wasi/build/wasitests.rs rename to lib/wasi-tests/build/wasitests.rs diff --git a/lib/wasi-tests/src/lib.rs b/lib/wasi-tests/src/lib.rs new file mode 100644 index 000000000..5df757613 --- /dev/null +++ b/lib/wasi-tests/src/lib.rs @@ -0,0 +1 @@ +// nothing to see here diff --git a/lib/wasi/tests/wasitest.rs b/lib/wasi-tests/tests/wasitest.rs similarity index 100% rename from lib/wasi/tests/wasitest.rs rename to lib/wasi-tests/tests/wasitest.rs diff --git a/lib/wasi/tests/wasitests/_common.rs b/lib/wasi-tests/tests/wasitests/_common.rs similarity index 100% rename from lib/wasi/tests/wasitests/_common.rs rename to lib/wasi-tests/tests/wasitests/_common.rs diff --git a/lib/wasi/tests/wasitests/create_dir.rs b/lib/wasi-tests/tests/wasitests/create_dir.rs similarity index 100% rename from lib/wasi/tests/wasitests/create_dir.rs rename to lib/wasi-tests/tests/wasitests/create_dir.rs diff --git a/lib/wasi/tests/wasitests/envvar.rs b/lib/wasi-tests/tests/wasitests/envvar.rs similarity index 100% rename from lib/wasi/tests/wasitests/envvar.rs rename to lib/wasi-tests/tests/wasitests/envvar.rs diff --git a/lib/wasi/tests/wasitests/file_metadata.rs b/lib/wasi-tests/tests/wasitests/file_metadata.rs similarity index 100% rename from lib/wasi/tests/wasitests/file_metadata.rs rename to lib/wasi-tests/tests/wasitests/file_metadata.rs diff --git a/lib/wasi/tests/wasitests/fs_sandbox_test.rs b/lib/wasi-tests/tests/wasitests/fs_sandbox_test.rs similarity index 100% rename from lib/wasi/tests/wasitests/fs_sandbox_test.rs rename to lib/wasi-tests/tests/wasitests/fs_sandbox_test.rs diff --git a/lib/wasi/tests/wasitests/hello.rs b/lib/wasi-tests/tests/wasitests/hello.rs similarity index 100% rename from lib/wasi/tests/wasitests/hello.rs rename to lib/wasi-tests/tests/wasitests/hello.rs diff --git a/lib/wasi/tests/wasitests/mapdir.rs b/lib/wasi-tests/tests/wasitests/mapdir.rs similarity index 100% rename from lib/wasi/tests/wasitests/mapdir.rs rename to lib/wasi-tests/tests/wasitests/mapdir.rs diff --git a/lib/wasi/tests/wasitests/mod.rs b/lib/wasi-tests/tests/wasitests/mod.rs similarity index 100% rename from lib/wasi/tests/wasitests/mod.rs rename to lib/wasi-tests/tests/wasitests/mod.rs diff --git a/lib/wasi/tests/wasitests/quine.rs b/lib/wasi-tests/tests/wasitests/quine.rs similarity index 100% rename from lib/wasi/tests/wasitests/quine.rs rename to lib/wasi-tests/tests/wasitests/quine.rs diff --git a/lib/wasi/wasitests/create_dir.out b/lib/wasi-tests/wasitests/create_dir.out similarity index 100% rename from lib/wasi/wasitests/create_dir.out rename to lib/wasi-tests/wasitests/create_dir.out diff --git a/lib/wasi/wasitests/create_dir.rs b/lib/wasi-tests/wasitests/create_dir.rs similarity index 100% rename from lib/wasi/wasitests/create_dir.rs rename to lib/wasi-tests/wasitests/create_dir.rs diff --git a/lib/wasi-tests/wasitests/create_dir.wasm b/lib/wasi-tests/wasitests/create_dir.wasm new file mode 100755 index 000000000..adfb1c2d3 Binary files /dev/null and b/lib/wasi-tests/wasitests/create_dir.wasm differ diff --git a/lib/wasi/wasitests/envvar.out b/lib/wasi-tests/wasitests/envvar.out similarity index 100% rename from lib/wasi/wasitests/envvar.out rename to lib/wasi-tests/wasitests/envvar.out diff --git a/lib/wasi/wasitests/envvar.rs b/lib/wasi-tests/wasitests/envvar.rs similarity index 100% rename from lib/wasi/wasitests/envvar.rs rename to lib/wasi-tests/wasitests/envvar.rs diff --git a/lib/wasi-tests/wasitests/envvar.wasm b/lib/wasi-tests/wasitests/envvar.wasm new file mode 100755 index 000000000..2fb521f3c Binary files /dev/null and b/lib/wasi-tests/wasitests/envvar.wasm differ diff --git a/lib/wasi/wasitests/file_metadata.out b/lib/wasi-tests/wasitests/file_metadata.out similarity index 100% rename from lib/wasi/wasitests/file_metadata.out rename to lib/wasi-tests/wasitests/file_metadata.out diff --git a/lib/wasi/wasitests/file_metadata.rs b/lib/wasi-tests/wasitests/file_metadata.rs similarity index 100% rename from lib/wasi/wasitests/file_metadata.rs rename to lib/wasi-tests/wasitests/file_metadata.rs diff --git a/lib/wasi-tests/wasitests/file_metadata.wasm b/lib/wasi-tests/wasitests/file_metadata.wasm new file mode 100755 index 000000000..a51bcdf7d Binary files /dev/null and b/lib/wasi-tests/wasitests/file_metadata.wasm differ diff --git a/lib/wasi/wasitests/fs_sandbox_test.out b/lib/wasi-tests/wasitests/fs_sandbox_test.out similarity index 100% rename from lib/wasi/wasitests/fs_sandbox_test.out rename to lib/wasi-tests/wasitests/fs_sandbox_test.out diff --git a/lib/wasi/wasitests/fs_sandbox_test.rs b/lib/wasi-tests/wasitests/fs_sandbox_test.rs similarity index 100% rename from lib/wasi/wasitests/fs_sandbox_test.rs rename to lib/wasi-tests/wasitests/fs_sandbox_test.rs diff --git a/lib/wasi-tests/wasitests/fs_sandbox_test.wasm b/lib/wasi-tests/wasitests/fs_sandbox_test.wasm new file mode 100755 index 000000000..f41bc5a17 Binary files /dev/null and b/lib/wasi-tests/wasitests/fs_sandbox_test.wasm differ diff --git a/lib/wasi/wasitests/hello.out b/lib/wasi-tests/wasitests/hello.out similarity index 100% rename from lib/wasi/wasitests/hello.out rename to lib/wasi-tests/wasitests/hello.out diff --git a/lib/wasi/wasitests/hello.rs b/lib/wasi-tests/wasitests/hello.rs similarity index 100% rename from lib/wasi/wasitests/hello.rs rename to lib/wasi-tests/wasitests/hello.rs diff --git a/lib/wasi-tests/wasitests/hello.wasm b/lib/wasi-tests/wasitests/hello.wasm new file mode 100755 index 000000000..958d5e36d Binary files /dev/null and b/lib/wasi-tests/wasitests/hello.wasm differ diff --git a/lib/wasi/wasitests/ignores.txt b/lib/wasi-tests/wasitests/ignores.txt similarity index 100% rename from lib/wasi/wasitests/ignores.txt rename to lib/wasi-tests/wasitests/ignores.txt diff --git a/lib/wasi/wasitests/mapdir.out b/lib/wasi-tests/wasitests/mapdir.out similarity index 100% rename from lib/wasi/wasitests/mapdir.out rename to lib/wasi-tests/wasitests/mapdir.out diff --git a/lib/wasi/wasitests/mapdir.rs b/lib/wasi-tests/wasitests/mapdir.rs similarity index 100% rename from lib/wasi/wasitests/mapdir.rs rename to lib/wasi-tests/wasitests/mapdir.rs diff --git a/lib/wasi-tests/wasitests/mapdir.wasm b/lib/wasi-tests/wasitests/mapdir.wasm new file mode 100755 index 000000000..32e34888c Binary files /dev/null and b/lib/wasi-tests/wasitests/mapdir.wasm differ diff --git a/lib/wasi/wasitests/quine.out b/lib/wasi-tests/wasitests/quine.out similarity index 100% rename from lib/wasi/wasitests/quine.out rename to lib/wasi-tests/wasitests/quine.out diff --git a/lib/wasi/wasitests/quine.rs b/lib/wasi-tests/wasitests/quine.rs similarity index 100% rename from lib/wasi/wasitests/quine.rs rename to lib/wasi-tests/wasitests/quine.rs diff --git a/lib/wasi-tests/wasitests/quine.wasm b/lib/wasi-tests/wasitests/quine.wasm new file mode 100755 index 000000000..3b195bb08 Binary files /dev/null and b/lib/wasi-tests/wasitests/quine.wasm differ diff --git a/lib/wasi/wasitests/test_fs/README.md b/lib/wasi-tests/wasitests/test_fs/README.md similarity index 100% rename from lib/wasi/wasitests/test_fs/README.md rename to lib/wasi-tests/wasitests/test_fs/README.md diff --git a/lib/wasi/wasitests/test_fs/hamlet/README.md b/lib/wasi-tests/wasitests/test_fs/hamlet/README.md similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/README.md rename to lib/wasi-tests/wasitests/test_fs/hamlet/README.md diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene1.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene1.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene1.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene2.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene2.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene2.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene3.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene3.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene3.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene3.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene4.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene4.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene4.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene4.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene5.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene5.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene5.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene5.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act2/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act2/scene1.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act2/scene1.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act2/scene1.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act2/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act2/scene2.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act2/scene2.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act2/scene2.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act3/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene1.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act3/scene1.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene1.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act3/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene2.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act3/scene2.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene2.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act3/scene3.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene3.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act3/scene3.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene3.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act3/scene4.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene4.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act3/scene4.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene4.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene1.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene1.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene1.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene2.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene2.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene2.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene3.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene3.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene3.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene3.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene4.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene4.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene4.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene4.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene5.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene5.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene5.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene5.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene6.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene6.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene6.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene6.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene7.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene7.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene7.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene7.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act5/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act5/scene1.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act5/scene1.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act5/scene1.txt diff --git a/lib/wasi/wasitests/test_fs/hamlet/act5/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act5/scene2.txt similarity index 100% rename from lib/wasi/wasitests/test_fs/hamlet/act5/scene2.txt rename to lib/wasi-tests/wasitests/test_fs/hamlet/act5/scene2.txt diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml index 4780a21b6..28426be0d 100644 --- a/lib/wasi/Cargo.toml +++ b/lib/wasi/Cargo.toml @@ -6,7 +6,6 @@ license = "MIT" authors = ["The Wasmer Engineering Team "] repository = "https://github.com/wasmerio/wasmer" edition = "2018" -build = "build/mod.rs" [dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.5.4" } @@ -17,21 +16,6 @@ hashbrown = "0.1.8" generational-arena = "0.2.2" log = "0.4.6" byteorder = "1.3.1" -# hack to get tests to work -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.4", optional = true } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.4", optional = true } [target.'cfg(windows)'.dependencies] -winapi = "0.3" - -[build-dependencies] -glob = "0.2.11" - -[dev-dependencies] -wasmer-clif-backend = { path = "../clif-backend", version = "0.5.4" } -wasmer-dev-utils = { path = "../dev-utils", version = "0.5.4"} - -[features] -clif = [] -singlepass = ["wasmer-singlepass-backend"] -llvm = ["wasmer-llvm-backend"] +winapi = "0.3" \ No newline at end of file diff --git a/lib/wasi/wasitests/create_dir.wasm b/lib/wasi/wasitests/create_dir.wasm deleted file mode 100755 index a8ec3cb5a..000000000 Binary files a/lib/wasi/wasitests/create_dir.wasm and /dev/null differ diff --git a/lib/wasi/wasitests/envvar.wasm b/lib/wasi/wasitests/envvar.wasm deleted file mode 100755 index 14bf02996..000000000 Binary files a/lib/wasi/wasitests/envvar.wasm and /dev/null differ diff --git a/lib/wasi/wasitests/file_metadata.wasm b/lib/wasi/wasitests/file_metadata.wasm deleted file mode 100755 index bc6fe76ff..000000000 Binary files a/lib/wasi/wasitests/file_metadata.wasm and /dev/null differ diff --git a/lib/wasi/wasitests/fs_sandbox_test.wasm b/lib/wasi/wasitests/fs_sandbox_test.wasm deleted file mode 100755 index e3b55f0c1..000000000 Binary files a/lib/wasi/wasitests/fs_sandbox_test.wasm and /dev/null differ diff --git a/lib/wasi/wasitests/hello.wasm b/lib/wasi/wasitests/hello.wasm deleted file mode 100755 index 58114e759..000000000 Binary files a/lib/wasi/wasitests/hello.wasm and /dev/null differ diff --git a/lib/wasi/wasitests/mapdir.wasm b/lib/wasi/wasitests/mapdir.wasm deleted file mode 100755 index a4f32480d..000000000 Binary files a/lib/wasi/wasitests/mapdir.wasm and /dev/null differ diff --git a/lib/wasi/wasitests/quine.wasm b/lib/wasi/wasitests/quine.wasm deleted file mode 100755 index 45d739f04..000000000 Binary files a/lib/wasi/wasitests/quine.wasm and /dev/null differ diff --git a/src/bin/wasmer.rs b/src/bin/wasmer.rs index 7d5a45345..d1e46fbd6 100644 --- a/src/bin/wasmer.rs +++ b/src/bin/wasmer.rs @@ -23,7 +23,8 @@ use wasmer_runtime::{ }; use wasmer_runtime_core::{ self, - backend::{Compiler, CompilerConfig, MemoryBoundCheckMode}, + backend::{Backend, Compiler, CompilerConfig, MemoryBoundCheckMode}, + debug, loader::{Instance as LoadedInstance, LocalLoader}, }; #[cfg(feature = "backend:singlepass")] @@ -115,9 +116,18 @@ struct Run { #[structopt(long = "resume")] resume: Option, + /// The command name is a string that will override the first argument passed + /// to the wasm program. This is used in wapm to provide nicer output in + /// help commands and error messages of the running wasm program #[structopt(long = "command-name", hidden = true)] command_name: Option, + /// A prehashed string, used to speed up start times by avoiding hashing the + /// wasm module. If the specified hash is not found, Wasmer will hash the module + /// as if no `cache-key` argument was passed. + #[structopt(long = "cache-key", hidden = true)] + cache_key: Option, + /// Application arguments #[structopt(name = "--", raw(multiple = "true"))] args: Vec, @@ -153,42 +163,6 @@ impl FromStr for LoaderName { } } -#[allow(dead_code)] -#[derive(Debug, Eq, PartialEq)] -enum Backend { - Cranelift, - Singlepass, - LLVM, -} - -impl Backend { - pub fn variants() -> &'static [&'static str] { - &[ - "cranelift", - #[cfg(feature = "backend:singlepass")] - "singlepass", - #[cfg(feature = "backend:llvm")] - "llvm", - ] - } -} - -impl FromStr for Backend { - type Err = String; - fn from_str(s: &str) -> Result { - match s.to_lowercase().as_str() { - "singlepass" => Ok(Backend::Singlepass), - "cranelift" => Ok(Backend::Cranelift), - "llvm" => Ok(Backend::LLVM), - // "llvm" => Err( - // "The LLVM backend option is not enabled by default due to binary size constraints" - // .to_string(), - // ), - _ => Err(format!("The backend {} doesn't exist", s)), - } - } -} - #[derive(Debug, StructOpt)] enum Cache { /// Clear the cache @@ -386,10 +360,6 @@ fn execute_wasm(options: &Run) -> Result<(), String> { } else { // If we have cache enabled - // We generate a hash for the given binary, so we can use it as key - // for the Filesystem cache - let hash = WasmHash::generate(&wasm_binary); - let wasmer_cache_dir = get_cache_dir(); // We create a new cache instance. @@ -398,31 +368,49 @@ fn execute_wasm(options: &Run) -> Result<(), String> { let mut cache = unsafe { FileSystemCache::new(wasmer_cache_dir).map_err(|e| format!("Cache error: {:?}", e))? }; - - // cache.load will return the Module if it's able to deserialize it properly, and an error if: - // * The file is not found - // * The file exists, but it's corrupted or can't be converted to a module - match cache.load(hash) { - Ok(module) => { - // We are able to load the module from cache - module + let load_cache_key = || -> Result<_, String> { + if let Some(ref prehashed_cache_key) = options.cache_key { + if let Ok(module) = + WasmHash::decode(prehashed_cache_key).and_then(|prehashed_key| { + cache.load_with_backend(prehashed_key, options.backend) + }) + { + debug!("using prehashed key: {}", prehashed_cache_key); + return Ok(module); + } } - Err(_) => { - let module = webassembly::compile_with_config_with( - &wasm_binary[..], - CompilerConfig { - symbol_map: em_symbol_map, - ..Default::default() - }, - &*compiler, - ) - .map_err(|e| format!("Can't compile module: {:?}", e))?; - // We try to save the module into a cache file - cache.store(hash, module.clone()).unwrap_or_default(); - module + // We generate a hash for the given binary, so we can use it as key + // for the Filesystem cache + let hash = WasmHash::generate(&wasm_binary); + + // cache.load will return the Module if it's able to deserialize it properly, and an error if: + // * The file is not found + // * The file exists, but it's corrupted or can't be converted to a module + match cache.load_with_backend(hash, options.backend) { + Ok(module) => { + // We are able to load the module from cache + Ok(module) + } + Err(_) => { + let module = webassembly::compile_with_config_with( + &wasm_binary[..], + CompilerConfig { + symbol_map: em_symbol_map, + ..Default::default() + }, + &*compiler, + ) + .map_err(|e| format!("Can't compile module: {:?}", e))?; + // We try to save the module into a cache file + cache.store(hash, module.clone()).unwrap_or_default(); + + Ok(module) + } } - } + }; + + load_cache_key()? }; if let Some(loader) = options.loader {