Add WASM test runner.

adriweb · adriweb · commit 0c1575436213 · 2026-05-14T16:56:13.000+02:00
Build tests.cpp as an Emscripten/Node runner so the wasm build can be checked with the same native test coverage. The wrapper sources emsdk when needed and decodes uncaught C++ exceptions into useful error messages. Wasm builds now support C++ exception handling, so the try/catch assertions should no longer be skipped in tests.cpp. Removing the guards keeps native and wasm test coverage aligned.

Necessary other change: move Emscripten createNew wrappers into bindings. Keep the JavaScript-friendly TIVarFile.createNew(string, ...) API without adding Emscripten-only string overloads to the C++ class. Those overloads made tests.cpp ambiguous when compiled with __EMSCRIPTEN__, so the wasm tests can now build the same source without undefining the platform macro.
diff --git a/.gitignore b/.gitignore
@@ -60,6 +60,8 @@ Thumbs.db
 *.data
 *.bc
 *.js.mem
+tivars_tests_wasm.js
+tivars_tests_wasm.wasm
 
 # IDEs things
 **/.idea/
diff --git a/Makefile.emscripten b/Makefile.emscripten
@@ -24,11 +24,15 @@ SOURCES := $(wildcard src/*.cpp) $(wildcard src/TypeHandlers/*.cpp) $(wildcard s
 OBJS = $(patsubst %.c, %.bc, $(patsubst %.cpp, %.bc, $(SOURCES)))
 
 OUTPUT := TIVarsLib
+TEST_OUTPUT := tivars_tests_wasm
 
 wasm:  $(OUTPUT).js
 
 all: wasm
 
+wasm-tests: $(TEST_OUTPUT).js
+	node --no-warnings scripts/run_wasm_tests.mjs
+
 %.bc: %.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
@@ -38,7 +42,16 @@ all: wasm
 $(OUTPUT).js: $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LFLAGS) $^ -o $@
 
+tests_wasm.bc: tests.cpp
+	$(CXX) $(CXXFLAGS) -Dmain=tivars_tests_main -c $< -o $@
+
+scripts/wasm_tests_main.bc: scripts/wasm_tests_main.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+$(TEST_OUTPUT).js: $(filter-out src/main_emscripten.bc,$(OBJS)) tests_wasm.bc scripts/wasm_tests_main.bc
+	$(CXX) $(CXXFLAGS) $(OPTFLAGS) --bind -s WASM=1 -s MODULARIZE=1 -s EXPORT_ES6=1 -s EXPORT_NAME="'TIVarsTests'" -s NODERAWFS=1 -s EXIT_RUNTIME=1 -s ASSERTIONS=$(ASSERTIONS) -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_RUNTIME_METHODS="['callMain','getExceptionMessage','decrementExceptionRefcount']" $^ -o $@
+
 clean:
-	$(RM) -f $(OBJS) $(OUTPUT).js* $(OUTPUT).was*
+	$(RM) -f $(OBJS) tests_wasm.bc scripts/wasm_tests_main.bc $(OUTPUT).js* $(OUTPUT).was* $(TEST_OUTPUT).js* $(TEST_OUTPUT).was*
 
-.PHONY: all clean wasm
+.PHONY: all clean wasm wasm-tests
diff --git a/scripts/run_wasm_tests.mjs b/scripts/run_wasm_tests.mjs
@@ -0,0 +1,40 @@
+/*
+ * Part of tivars_lib_cpp
+ * (C) 2015-2026 Adrien "Adriweb" Bertrand
+ * https://github.com/adriweb/tivars_lib_cpp
+ * License: MIT
+ */
+
+import { dirname, resolve } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const scriptDir = dirname(fileURLToPath(import.meta.url));
+const rootDir = resolve(scriptDir, "..");
+process.chdir(rootDir);
+
+const { default: TIVarsTests } = await import(pathToFileURL(resolve(rootDir, "tivars_tests_wasm.js")).href);
+const module = await TIVarsTests({ noInitialRun: true });
+
+try
+{
+    module.callMain(process.argv.slice(2));
+}
+catch (e)
+{
+    if (e && e.name === "ExitStatus")
+    {
+        process.exitCode = e.status;
+    }
+    else if (e && typeof e.excPtr === "number" && module.getExceptionMessage)
+    {
+        const [type, message] = module.getExceptionMessage(e);
+        module.decrementExceptionRefcount(e);
+        console.error(`Unhandled C++ exception in wasm tests: ${type}: ${message}`);
+        process.exitCode = 1;
+    }
+    else
+    {
+        console.error(e);
+        process.exitCode = 1;
+    }
+}
diff --git a/scripts/wasm_tests.sh b/scripts/wasm_tests.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+
+if ! command -v em++ >/dev/null 2>&1; then
+    if [[ -n "${EMSDK_ENV:-}" && -f "$EMSDK_ENV" ]]; then
+        # shellcheck disable=SC1090
+        source "$EMSDK_ENV" >/dev/null 2>&1
+    elif [[ -f "$HOME/emsdk/emsdk_env.sh" ]]; then
+        # shellcheck disable=SC1091
+        source "$HOME/emsdk/emsdk_env.sh" >/dev/null 2>&1
+    fi
+fi
+
+if ! command -v em++ >/dev/null 2>&1; then
+    echo "em++ not found; source emsdk_env.sh first or set EMSDK_ENV=/path/to/emsdk_env.sh" >&2
+    exit 127
+fi
+
+if ! command -v node >/dev/null 2>&1; then
+    echo "node not found; Node.js is required to run the wasm tests" >&2
+    exit 127
+fi
+
+make -C "$ROOT_DIR" -f Makefile.emscripten wasm-tests
diff --git a/scripts/wasm_tests_main.cpp b/scripts/wasm_tests_main.cpp
@@ -0,0 +1,29 @@
+/*
+ * Part of tivars_lib_cpp
+ * (C) 2015-2026 Adrien "Adriweb" Bertrand
+ * https://github.com/adriweb/tivars_lib_cpp
+ * License: MIT
+ */
+
+#include <exception>
+#include <iostream>
+
+int tivars_tests_main(int argc, char** argv);
+
+int main(int argc, char** argv)
+{
+    try
+    {
+        return tivars_tests_main(argc, argv);
+    }
+    catch (const std::exception& e)
+    {
+        std::cerr << "Unhandled C++ exception in wasm tests: " << e.what() << '\n';
+        return 1;
+    }
+    catch (...)
+    {
+        std::cerr << "Unhandled non-standard exception in wasm tests\n";
+        return 1;
+    }
+}
diff --git a/src/TIVarFile.cpp b/src/TIVarFile.cpp
@@ -1047,6 +1047,25 @@ namespace tivars
 #ifdef __EMSCRIPTEN__
     #include <emscripten/bind.h>
     using namespace emscripten;
+
+    namespace
+    {
+        tivars::TIVarFile createNewFromStrings(const std::string& type, const std::string& name, const std::string& model)
+        {
+            return tivars::TIVarFile::createNew(tivars::TIVarType{type}, name, tivars::TIModel{model});
+        }
+
+        tivars::TIVarFile createNewFromStrings(const std::string& type, const std::string& name)
+        {
+            return tivars::TIVarFile::createNew(tivars::TIVarType{type}, name);
+        }
+
+        tivars::TIVarFile createNewFromString(const std::string& type)
+        {
+            return tivars::TIVarFile::createNew(tivars::TIVarType{type});
+        }
+    }
+
     EMSCRIPTEN_BINDINGS(_tivarfile) {
 
             register_map<std::string, int>("options_t");
@@ -1076,9 +1095,9 @@ namespace tivars
                     .function("saveVarToFile"            , select_overload<std::string(void)>(&tivars::TIVarFile::saveVarToFile))
 
                     .class_function("loadFromFile", &tivars::TIVarFile::loadFromFile, return_value_policy::take_ownership())
-                    .class_function("createNew", select_overload<tivars::TIVarFile(const std::string&, const std::string&, const std::string&)>(&tivars::TIVarFile::createNew), return_value_policy::take_ownership())
-                    .class_function("createNew", select_overload<tivars::TIVarFile(const std::string&, const std::string&)>(&tivars::TIVarFile::createNew), return_value_policy::take_ownership())
-                    .class_function("createNew", select_overload<tivars::TIVarFile(const std::string&)>(&tivars::TIVarFile::createNew), return_value_policy::take_ownership())
+                    .class_function("createNew", select_overload<tivars::TIVarFile(const std::string&, const std::string&, const std::string&)>(&createNewFromStrings), return_value_policy::take_ownership())
+                    .class_function("createNew", select_overload<tivars::TIVarFile(const std::string&, const std::string&)>(&createNewFromStrings), return_value_policy::take_ownership())
+                    .class_function("createNew", &createNewFromString, return_value_policy::take_ownership())
             ;
     }
 #endif
diff --git a/src/TIVarFile.h b/src/TIVarFile.h
@@ -72,22 +72,6 @@ namespace tivars
         static TIVarFile createNew(const TIVarType& type, const std::string& name);
         static TIVarFile createNew(const TIVarType& type);
 
-        // Additional overloads for easier Emscripten usage
-#ifdef __EMSCRIPTEN__
-        static TIVarFile createNew(const std::string& type, const std::string& name, const std::string& model)
-        {
-            return TIVarFile{TIVarType{type}, name, TIModel{model}};
-        }
-        static TIVarFile createNew(const std::string& type, const std::string& name)
-        {
-            return createNew(TIVarType{type}, name);
-        }
-        static TIVarFile createNew(const std::string& type)
-        {
-            return createNew(TIVarType{type});
-        }
-#endif
-
         uint16_t getChecksumValueFromFile();
 
         void setContentFromData(const data_t& data, uint16_t entryIdx);
diff --git a/tests.cpp b/tests.cpp
@@ -487,7 +487,6 @@ int main(int argc, char** argv)
         assert(TH_Matrix::getMinVersionFromData(makeCollectionData(0x1C)) == VER_CE_EXACTONLY);
     }
 
-#ifndef __EMSCRIPTEN__
     {
         // TH_TempEqu error handling: too short and inconsistent lengths
         try {
@@ -500,7 +499,6 @@ int main(int argc, char** argv)
             assert(false);
         } catch (const std::invalid_argument&) {}
     }
-#endif
 
     {
         // Alias tokenization: arcsin/asin variants should map to sin⁻¹(
@@ -1203,7 +1201,6 @@ int main(int argc, char** argv)
         assert(testReal.getReadableContent() == "-1.2345678901235e30");
     }
 
-#ifndef __EMSCRIPTEN__
     {
         try
         {
@@ -1216,7 +1213,6 @@ int main(int argc, char** argv)
             cout << "Caught expected exception: " << e.what() << endl;
         }
     }
-#endif
 
     {
         TIVarFile testReal42 = TIVarFile::createNew("Real", "R");
@@ -1343,7 +1339,6 @@ End)";
         assert(trim(testPrgmReindent.getReadableContent({{"prettify", true}, {"reindent", true}})) == "\"http://TIPlanet.org");
     }
 
-#ifndef __EMSCRIPTEN__
     {
         try
         {
@@ -1360,7 +1355,6 @@ End)";
             cout << "Caught expected exception: " << e.what() << endl;
         }
     }
-#endif
 
     assert(TIVarType{"ExactRealPi"}.getId() == 32);
 
@@ -1466,7 +1460,6 @@ End)";
         assert(matrixWithNewline.getReadableContent() == "[[1,2][3,4]]");
     }
 
-#ifndef __EMSCRIPTEN__
     {
         try
         {
@@ -1496,7 +1489,6 @@ End)";
         {
         }
     }
-#endif
 
     {
         TIVarFile testComplex = TIVarFile::loadFromFile("testData/Complex.8xc"); // -5 + 2i

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,6 @@ int main(int argc, char** argv)`
`487`	`487`	`assert(TH_Matrix::getMinVersionFromData(makeCollectionData(0x1C)) == VER_CE_EXACTONLY);`
`488`	`488`	`}`
`489`	`489`
`490`		`-#ifndef __EMSCRIPTEN__`
`491`	`490`	`{`
`492`	`491`	`// TH_TempEqu error handling: too short and inconsistent lengths`
`493`	`492`	`try {`
`@@ -500,7 +499,6 @@ int main(int argc, char** argv)`
`500`	`499`	`assert(false);`
`501`	`500`	`} catch (const std::invalid_argument&) {}`
`502`	`501`	`}`
`503`		`-#endif`
`504`	`502`
`505`	`503`	`{`
`506`	`504`	`// Alias tokenization: arcsin/asin variants should map to sin⁻¹(`
`@@ -1203,7 +1201,6 @@ int main(int argc, char** argv)`
`1203`	`1201`	`assert(testReal.getReadableContent() == "-1.2345678901235e30");`
`1204`	`1202`	`}`
`1205`	`1203`
`1206`		`-#ifndef __EMSCRIPTEN__`
`1207`	`1204`	`{`
`1208`	`1205`	`try`
`1209`	`1206`	`{`
`@@ -1216,7 +1213,6 @@ int main(int argc, char** argv)`
`1216`	`1213`	`cout << "Caught expected exception: " << e.what() << endl;`
`1217`	`1214`	`}`
`1218`	`1215`	`}`
`1219`		`-#endif`
`1220`	`1216`
`1221`	`1217`	`{`
`1222`	`1218`	`TIVarFile testReal42 = TIVarFile::createNew("Real", "R");`
`@@ -1343,7 +1339,6 @@ End)";`
`1343`	`1339`	`assert(trim(testPrgmReindent.getReadableContent({{"prettify", true}, {"reindent", true}})) == "\"http://TIPlanet.org");`
`1344`	`1340`	`}`
`1345`	`1341`
`1346`		`-#ifndef __EMSCRIPTEN__`
`1347`	`1342`	`{`
`1348`	`1343`	`try`
`1349`	`1344`	`{`
`@@ -1360,7 +1355,6 @@ End)";`
`1360`	`1355`	`cout << "Caught expected exception: " << e.what() << endl;`
`1361`	`1356`	`}`
`1362`	`1357`	`}`
`1363`		`-#endif`
`1364`	`1358`
`1365`	`1359`	`assert(TIVarType{"ExactRealPi"}.getId() == 32);`
`1366`	`1360`
`@@ -1466,7 +1460,6 @@ End)";`
`1466`	`1460`	`assert(matrixWithNewline.getReadableContent() == "[[1,2][3,4]]");`
`1467`	`1461`	`}`
`1468`	`1462`
`1469`		`-#ifndef __EMSCRIPTEN__`
`1470`	`1463`	`{`
`1471`	`1464`	`try`
`1472`	`1465`	`{`
`@@ -1496,7 +1489,6 @@ End)";`
`1496`	`1489`	`{`
`1497`	`1490`	`}`
`1498`	`1491`	`}`
`1499`		`-#endif`
`1500`	`1492`
`1501`	`1493`	`{`
`1502`	`1494`	`TIVarFile testComplex = TIVarFile::loadFromFile("testData/Complex.8xc"); // -5 + 2i`