tests: run testcases in strict mode

Since /sbin/fw4 invokes ucode in strict mode, we should do the same in
test cases.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/run_tests.sh b/run_tests.sh
index 2bdefbd5029cbd09136ca61ba3ab458755afbdf1..dcc680215305fdc60221d7c1d0cc3431796cafe3 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -70,7 +70,7 @@ run_testcase() {
        local code=$7
        local fail=0
 
-       ucode ${uenv:+-e "$uenv"} -e '{
+       ucode -S ${uenv:+-e "$uenv"} -e '{
                "MOCK_SEARCH_PATH": [
                        "'"$dir"'/files",
                        "./tests/mocks"

diff --git a/tests/lib/mocklib.uc b/tests/lib/mocklib.uc
index bcbb74054a42458695ea3691b28d6e865c41d0bf..5441bfbffe824644afb08cf8942292f544e140b3 100644 (file)
--- a/tests/lib/mocklib.uc
+++ b/tests/lib/mocklib.uc
@@ -1,4 +1,14 @@
 {%
+       /* strict mode compliance: ensure that global variabes are defined */
+       if (!exists(global, 'REQUIRE_SEARCH_PATH'))
+               global.MOCK_SEARCH_PATH = null;
+
+       if (!exists(global, 'MOCK_SEARCH_PATH'))
+               global.MOCK_SEARCH_PATH = null;
+
+       if (!exists(global, 'TRACE_CALLS'))
+               global.TRACE_CALLS = null;
+
        let _fs = require("fs");
 
        /* Force reloading fs module on next require */

diff --git a/tests/lib/mocklib/uci.uc b/tests/lib/mocklib/uci.uc
index 542eeb87f0ce75e698c7f5e21ddce08131e31bda..69d25615faaaee94c23e8e06cb9ea1ebc0f18715 100644 (file)
--- a/tests/lib/mocklib/uci.uc
+++ b/tests/lib/mocklib/uci.uc
@@ -23,6 +23,7 @@
 
        let fixup_config = (config) => {
                let rv = {};
+               let n_section = 0;
 
                for (let stype in config) {
                        switch (type(config[stype])) {