Split feature tests and examples (#117)

* Move feature_tests to new folder * Move tests over * Rescope under include/ * Regen everything * Add new regen script * Update CI
rust-diplomat · Dec 21, 2021 · b448e1e · b448e1e
1 parent 27e52e2
commit b448e1e
Show file tree

Hide file tree

Showing 88 changed files with 1,184 additions and 409 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,29 +30,39 @@ jobs:
       run: cd example && ./gen_all.sh
     - name: Test example is fresh
       run: git diff --exit-code
-  example:
+  tests-and-example:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Build
+    - name: Build tests
+      run: cd feature_tests && cargo build
+    - name: CPP tests
+      run: cd feature_tests/cpp && make CXX=g++-10
+    - name: Build examples
       run: cd example && cargo build
-    - name: CPP
+    - name: CPP examples
       run: cd example/cpp && make CXX=g++-10
-    - name: C
+    - name: C examples
       run: cd example/c && make
-  example-wasm:
+  tests-and-example-wasm:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Load Rust toolchain for WASM.
       run: rustup target add wasm32-unknown-unknown
-    - name: Build
-      run: cd example && cargo build --target wasm32-unknown-unknown
     - name: Install Node.js v14.17.0
       uses: actions/setup-node@v1
       with:
         node-version: 14.17.0
-    - name: install node deps
+    - name: Build feature tests
+      run: cd feature_tests && cargo build --target wasm32-unknown-unknown
+    - name: install node deps for feature_tests
+      run: cd feature_tests/js && npm install
+    - name: test feature_tests
+      run: cd feature_tests/js && npm run test
+    - name: Build examples
+      run: cd example && cargo build --target wasm32-unknown-unknown
+    - name: install node deps for example
       run: cd example/js && npm install
-    - name: test
+    - name: test example
       run: cd example/js && npm run test
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,5 +4,6 @@ members = [
   "macro",
   "runtime",
   "tool",
-  "example"
+  "example",
+  "feature_tests",
 ]
diff --git a/example/Cargo.toml b/example/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "example"
+name = "diplomat-example"
 version = "0.2.0"
 authors = ["Shadaj Laddad <[email protected]>"]
 edition = "2018"

diff --git a/example/c/Makefile b/example/c/Makefile
@@ -11,11 +11,11 @@ $(ALL_RUST):
 $(ALL_HEADERS):
 
 
-../../target/debug/libexample.a: $(ALL_RUST)
+../../target/debug/libdiplomat_example.a: $(ALL_RUST)
 	cargo build
 
-a.out: ../../target/debug/libexample.a $(ALL_HEADERS) main.c
-	$(CC) main.c ../../target/debug/libexample.a -ldl -lpthread -lm -g
+a.out: ../../target/debug/libdiplomat_example.a $(ALL_HEADERS) main.c
+	$(CC) main.c ../../target/debug/libdiplomat_example.a -ldl -lpthread -lm -g
 
 build: a.out
 

diff --git a/example/cpp/Makefile b/example/cpp/Makefile
@@ -11,24 +11,16 @@ $(ALL_RUST):
 $(ALL_HEADERS):
 
 
-../../target/debug/libexample.a: $(ALL_RUST)
+../../target/debug/libdiplomat_example.a: $(ALL_RUST)
 	cargo build
 
-./tests/fixeddecimal.out: ../../target/debug/libexample.a $(ALL_HEADERS) ./tests/fixeddecimal.cpp
-	$(CXX) -std=c++17 ./tests/fixeddecimal.cpp ../../target/debug/libexample.a -ldl -lpthread -lm -g -o ./tests/fixeddecimal.out
+./tests/fixeddecimal.out: ../../target/debug/libdiplomat_example.a $(ALL_HEADERS) ./tests/fixeddecimal.cpp
+	$(CXX) -std=c++17 ./tests/fixeddecimal.cpp ../../target/debug/libdiplomat_example.a -ldl -lpthread -lm -g -o ./tests/fixeddecimal.out
 
-./tests/fixeddecimal-20.out: ../../target/debug/libexample.a $(ALL_HEADERS) ./tests/fixeddecimal.cpp
-	$(CXX) -std=c++20 ./tests/fixeddecimal.cpp ../../target/debug/libexample.a -ldl -lpthread -lm -g -o ./tests/fixeddecimal-20.out
+./tests/fixeddecimal-20.out: ../../target/debug/libdiplomat_example.a $(ALL_HEADERS) ./tests/fixeddecimal.cpp
+	$(CXX) -std=c++20 ./tests/fixeddecimal.cpp ../../target/debug/libdiplomat_example.a -ldl -lpthread -lm -g -o ./tests/fixeddecimal-20.out
 
-./tests/structs.out: ../../target/debug/libexample.a $(ALL_HEADERS) ./tests/structs.cpp
-	$(CXX) -std=c++17 ./tests/structs.cpp ../../target/debug/libexample.a -ldl -lpthread -lm -g -o ./tests/structs.out
 
-./tests/result.out: ../../target/debug/libexample.a $(ALL_HEADERS) ./tests/result.cpp
-	$(CXX) -std=c++17 ./tests/result.cpp ../../target/debug/libexample.a -ldl -lpthread -lm -g -o ./tests/result.out
-
-
-test: ./tests/fixeddecimal.out ./tests/fixeddecimal-20.out ./tests/structs.out ./tests/result.out
+test: ./tests/fixeddecimal.out ./tests/fixeddecimal-20.out
 	./tests/fixeddecimal.out
 	./tests/fixeddecimal-20.out
-	./tests/structs.out
-	./tests/result.out
diff --git a/example/cpp/ResultOpaque.h b/example/cpp/ResultOpaque.h
diff --git a/example/cpp/docs/index.rst b/example/cpp/docs/index.rst
@@ -7,8 +7,6 @@ Documentation
 
    data_provider_ffi
    decimal_ffi
-   feature_tests_result_ffi
-   feature_tests_structs_ffi
    fixed_decimal_ffi
    locale_ffi
 

diff --git a/example/cpp/ICU4XDataProvider.h → example/cpp/include/ICU4XDataProvider.h b/example/cpp/ICU4XDataProvider.h → example/cpp/include/ICU4XDataProvider.h
diff --git a/example/cpp/ICU4XDataProvider.hpp → example/cpp/include/ICU4XDataProvider.hpp b/example/cpp/ICU4XDataProvider.hpp → example/cpp/include/ICU4XDataProvider.hpp
diff --git a/example/cpp/ICU4XFixedDecimal.h → example/cpp/include/ICU4XFixedDecimal.h b/example/cpp/ICU4XFixedDecimal.h → example/cpp/include/ICU4XFixedDecimal.h
diff --git a/example/cpp/ICU4XFixedDecimal.hpp → example/cpp/include/ICU4XFixedDecimal.hpp b/example/cpp/ICU4XFixedDecimal.hpp → example/cpp/include/ICU4XFixedDecimal.hpp
diff --git a/example/cpp/ICU4XFixedDecimalFormat.h → ...ple/cpp/include/ICU4XFixedDecimalFormat.h b/example/cpp/ICU4XFixedDecimalFormat.h → ...ple/cpp/include/ICU4XFixedDecimalFormat.h
diff --git a/example/cpp/ICU4XFixedDecimalFormat.hpp → ...e/cpp/include/ICU4XFixedDecimalFormat.hpp b/example/cpp/ICU4XFixedDecimalFormat.hpp → ...e/cpp/include/ICU4XFixedDecimalFormat.hpp
diff --git a/example/cpp/ICU4XFixedDecimalFormatOptions.h → .../include/ICU4XFixedDecimalFormatOptions.h b/example/cpp/ICU4XFixedDecimalFormatOptions.h → .../include/ICU4XFixedDecimalFormatOptions.h
diff --git a/...le/cpp/ICU4XFixedDecimalFormatOptions.hpp → ...nclude/ICU4XFixedDecimalFormatOptions.hpp b/...le/cpp/ICU4XFixedDecimalFormatOptions.hpp → ...nclude/ICU4XFixedDecimalFormatOptions.hpp
diff --git a/example/cpp/ICU4XFixedDecimalFormatResult.h → ...p/include/ICU4XFixedDecimalFormatResult.h b/example/cpp/ICU4XFixedDecimalFormatResult.h → ...p/include/ICU4XFixedDecimalFormatResult.h
diff --git a/...ple/cpp/ICU4XFixedDecimalFormatResult.hpp → ...include/ICU4XFixedDecimalFormatResult.hpp b/...ple/cpp/ICU4XFixedDecimalFormatResult.hpp → ...include/ICU4XFixedDecimalFormatResult.hpp
diff --git a/...e/cpp/ICU4XFixedDecimalGroupingStrategy.h → ...clude/ICU4XFixedDecimalGroupingStrategy.h b/...e/cpp/ICU4XFixedDecimalGroupingStrategy.h → ...clude/ICU4XFixedDecimalGroupingStrategy.h
diff --git a/...cpp/ICU4XFixedDecimalGroupingStrategy.hpp → ...ude/ICU4XFixedDecimalGroupingStrategy.hpp b/...cpp/ICU4XFixedDecimalGroupingStrategy.hpp → ...ude/ICU4XFixedDecimalGroupingStrategy.hpp
diff --git a/example/cpp/ICU4XFixedDecimalSignDisplay.h → ...pp/include/ICU4XFixedDecimalSignDisplay.h b/example/cpp/ICU4XFixedDecimalSignDisplay.h → ...pp/include/ICU4XFixedDecimalSignDisplay.h
diff --git a/example/cpp/ICU4XFixedDecimalSignDisplay.hpp → .../include/ICU4XFixedDecimalSignDisplay.hpp b/example/cpp/ICU4XFixedDecimalSignDisplay.hpp → .../include/ICU4XFixedDecimalSignDisplay.hpp
diff --git a/example/cpp/ICU4XLocale.h → example/cpp/include/ICU4XLocale.h b/example/cpp/ICU4XLocale.h → example/cpp/include/ICU4XLocale.h
diff --git a/example/cpp/ICU4XLocale.hpp → example/cpp/include/ICU4XLocale.hpp b/example/cpp/ICU4XLocale.hpp → example/cpp/include/ICU4XLocale.hpp
diff --git a/example/cpp/diplomat_runtime.h → example/cpp/include/diplomat_runtime.h b/example/cpp/diplomat_runtime.h → example/cpp/include/diplomat_runtime.h
diff --git a/example/cpp/diplomat_runtime.hpp → example/cpp/include/diplomat_runtime.hpp b/example/cpp/diplomat_runtime.hpp → example/cpp/include/diplomat_runtime.hpp
diff --git a/example/cpp/result_void_void.h → example/cpp/include/result_void_void.h b/example/cpp/result_void_void.h → example/cpp/include/result_void_void.h
diff --git a/example/cpp/tests/fixeddecimal.cpp b/example/cpp/tests/fixeddecimal.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../ICU4XFixedDecimalFormat.hpp"
+#include "../include/ICU4XFixedDecimalFormat.hpp"
 #include "assert.hpp"
 
 int main(int argc, char *argv[]) {

diff --git a/example/gen_all.sh b/example/gen_all.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 ../target/debug/diplomat-tool js js/ --docs js/docs/
 ../target/debug/diplomat-tool c c/
-../target/debug/diplomat-tool cpp cpp/ --docs cpp/docs/
+../target/debug/diplomat-tool cpp cpp/include --docs cpp/docs/