From 6d415abfcb3accd3ae18de2788cc5547084351c8 Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Tue, 3 Sep 2024 17:27:26 +0100 Subject: [PATCH] WIP CI fixes. --- tests/quickjs/premake5.lua | 11 +++++------ tests/quickjs/test.sh | 6 ++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/quickjs/premake5.lua b/tests/quickjs/premake5.lua index 784ede1b3..483255044 100644 --- a/tests/quickjs/premake5.lua +++ b/tests/quickjs/premake5.lua @@ -1,5 +1,4 @@ -local qjs_dir = path.getabsolute("./runtime") -local runtime = "../../src/Generator/Generators/QuickJS/Runtime" +local cppsharp_qjs_runtime = "../../src/Generator/Generators/QuickJS/cppsharp_qjs_runtime" workspace "qjs" configurations { "debug", "release" } @@ -13,13 +12,13 @@ workspace "qjs" files { "gen/**.cpp", - runtime .. "/*.cpp", - runtime .. "/*.c" + cppsharp_qjs_runtime .. "/*.cpp", + cppsharp_qjs_runtime .. "/*.c" } includedirs { - qjs_dir, - runtime, + "runtime", + cppsharp_qjs_runtime, "..", "../../include" } diff --git a/tests/quickjs/test.sh b/tests/quickjs/test.sh index 70a189d90..0e79edddf 100755 --- a/tests/quickjs/test.sh +++ b/tests/quickjs/test.sh @@ -7,7 +7,9 @@ configuration=debug platform=x64 jsinterp="$dir/runtime/build/qjs" -if [ $CI = "true" ]; then +cd $dir + +if [ "$CI" = "true" ]; then red="" green="" reset="" @@ -28,7 +30,7 @@ fi echo "${green}Building generated binding files${reset}" premake=$rootdir/build/premake.sh config=$configuration $premake --file=$dir/premake5.lua gmake -make -C $dir/gen +verbose=true make -C $dir/gen echo echo "${green}Executing JS tests with QuickJS${reset}"