diff --git a/tests/quickjs/bootstrap.sh b/tests/quickjs/bootstrap.sh index c0d1666e7..f27eed021 100755 --- a/tests/quickjs/bootstrap.sh +++ b/tests/quickjs/bootstrap.sh @@ -3,6 +3,8 @@ set -e dir=$(cd "$(dirname "$0")"; pwd) rootdir="$dir/../.." +cd $dir + if [ ! -d runtime ]; then git clone https://github.com/quickjs-ng/quickjs.git runtime git -C runtime reset --hard 0e5e9c2c49db15ab9579edeb4d90e610c8b8463f diff --git a/tests/quickjs/premake5.lua b/tests/quickjs/premake5.lua index 784ede1b3..45f408c1c 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/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}"