Quick and dirty testing of luaJIT+luaproc from LuaSL.

2 files changed, 32 insertions, 15 deletions

diff --git a/LuaSL/luaprocTest.sh b/LuaSL/luaprocTest.sh
deleted file mode 100755
index 98f37f5..0000000
--- a/LuaSL/luaprocTest.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-cd testLua
-
-LUA_SOPATH="../../libraries/luaproc/" lua luaprocTest0.lua
-
-time LUA_SOPATH="../../libraries/luaproc/" lua luaprocTest1.lua
-
-time LUA_SOPATH="../../libraries/luaproc/" luajit luaprocTest1.lua
-
-time LUA_SOPATH="../../libraries/luaproc/" lua luaprocTest2.lua
-
-time LUA_SOPATH="../../libraries/luaproc/" luajit luaprocTest2.lua
-
diff --git a/LuaSL/src/LuaSL_main.c b/LuaSL/src/LuaSL_main.c
index efa3d43..3f20460 100644
--- a/LuaSL/src/LuaSL_main.c
+++ b/LuaSL/src/LuaSL_main.c
@@ -1,6 +1,6 @@
 #include "LuaSL.h"
 
-#define LUA_TEST        0
+#define LUA_TEST        1
 
 static int scriptCount;
 
@@ -264,6 +264,37 @@ main(int argc, char **argv)
         printf("Compiling %d Lua scripts took %f seconds, that's %f scripts per second.\n\n", scriptCount, diff, scriptCount / diff);
 
         printf("Combined estimate of compiling speed is %f scripts per second.\n", 1 / ((diff0 / lslCount) + (diff / scriptCount)));
+
+        gettimeofday(&lastTime2, 0);
+        snprintf(buf, sizeof(buf), "cd %s/testLua; LUA_SOPATH='../../libraries/luaproc/' lua luaprocTest0.lua", PACKAGE_DATA_DIR);
+        system(buf);
+        diff = timeDiff(&thisTime2, &lastTime2);
+        printf("%s TOOK %f seconds.\n", buf, diff);
+
+        gettimeofday(&lastTime2, 0);
+        snprintf(buf, sizeof(buf), "cd %s/testLua; LUA_SOPATH='../../libraries/luaproc/' lua luaprocTest1.lua", PACKAGE_DATA_DIR);
+        system(buf);
+        diff = timeDiff(&thisTime2, &lastTime2);
+        printf("%s TOOK %f seconds.\n", buf, diff);
+
+        gettimeofday(&lastTime2, 0);
+        snprintf(buf, sizeof(buf), "cd %s/testLua; LUA_SOPATH='../../libraries/luaproc/' luajit luaprocTest1.lua", PACKAGE_DATA_DIR);
+        system(buf);
+        diff = timeDiff(&thisTime2, &lastTime2);
+        printf("%s TOOK %f seconds.\n", buf, diff);
+
+        gettimeofday(&lastTime2, 0);
+        snprintf(buf, sizeof(buf), "cd %s/testLua; LUA_SOPATH='../../libraries/luaproc/' lua luaprocTest2.lua", PACKAGE_DATA_DIR);
+        system(buf);
+        diff = timeDiff(&thisTime2, &lastTime2);
+        printf("%s TOOK %f seconds.\n", buf, diff);
+
+        gettimeofday(&lastTime2, 0);
+        snprintf(buf, sizeof(buf), "cd %s/testLua; LUA_SOPATH='../../libraries/luaproc/' luajit luaprocTest2.lua", PACKAGE_DATA_DIR);
+        system(buf);
+        diff = timeDiff(&thisTime2, &lastTime2);
+        printf("%s TOOK %f seconds.\n", buf, diff);
+
 #endif
 
         if (game.ui)