Merge branch 4.x

modules/js/test/init_cv.js

@@ -2,13 +2,18 @@
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html.
 
-if (cv instanceof Promise) {
-    QUnit.test("init_cv", (assert) => {
+QUnit.test("init_cv", (assert) => {
+    if (cv instanceof Promise) {
         const done = assert.async();
-        assert.ok(true);
         cv.then((ready_cv) => {
             cv = ready_cv;
             done();
         });
-    });
-}
+    } else if (cv.getBuildInformation === undefined) {
+        const done = assert.async();
+        cv['onRuntimeInitialized'] = () => {
+            done();
+        }
+    }
+    assert.ok(true);
+});