makefile : fix testing

luffah · Apr 9, 2021 · 5288879 · 5288879
1 parent 0f9f497
commit 5288879
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -91,8 +91,8 @@ css:
 # 			             --output="$${TGTDIR}/$${TGT}";\
 # 			done
 
-testfs:
-	firefox --jsconsole --safe-mode src/testing.html?filesystem
+testfs: assemble
+	firefox --jsconsole --safe-mode ${GAME}/webroot/testing.html?filesystem
 
 help: ## Show this help
 	@sed -n \

diff --git a/game/terminus/webroot/testing.html b/game/terminus/webroot/testing.html
@@ -3,6 +3,7 @@
   <head id='head'>
   <meta charset="utf-8" />
   <script type="text/javascript" src="js.engine/utils/xhr.js"></script>
+  <script type="text/javascript" src="js.engine/utils/testing.js"></script>
   <script>
   /*
    *  Load index.html and inject test scripts inside
@@ -13,11 +14,9 @@
    */
   xhr_load(
     "index.html",
-    [ '../tests/Testing.js' ].concat(
     window.location.search.substr(1).split(',').map(
-      (s) => '../tests/test_' + s + '.js')
-    ),
-    'css/terminus.testing.css'
+      (s) => '../tests/test_' + s + '.js'),
+    'css/terminus.testing.css' // FIXME where is this file
   )
    </script>
   </head>

diff --git a/game/terminus/webroot/testlang.html b/game/terminus/webroot/testlang.html
@@ -2,12 +2,12 @@
 <html>
   <head id='head'>
   <meta charset="utf-8" />
-  <script type="text/javascript" src="engine/utils/xhr.js"></script>
+  <script type="text/javascript" src="./js.engine/utils/xhr.js"></script>
   <script>
     xhr_load(
       "index.html",
       window.location.search.substr(1).map(() => {
-        './js/_build/terminus.dialog.'+__lang+'.js'
+        './js.build/dialog.'+__lang+'.js'
       })
     )
    </script>