diff --git a/kokoro/linux-clang-cmake/build-docker.sh b/kokoro/linux-clang-cmake/build-docker.sh index c5fdcd2356..8fcec959ca 100755 --- a/kokoro/linux-clang-cmake/build-docker.sh +++ b/kokoro/linux-clang-cmake/build-docker.sh @@ -46,5 +46,8 @@ using ninja-1.10.0 echo "Building..." mkdir /build && cd /build -cmake "$ROOT_DIR" -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS +INSTALLDIR="$(pwd)/install" +cmake "$ROOT_DIR" -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="INSTALLDIR" -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS +ctest --output-on-failure ninja install +(cd "$ROOT_DIR"/Test && sh ./runtests /build/localResults "$INSTALLDIR"/bin/glslangValidator "$INSTALLDIR"/bin/spirv-remap) diff --git a/kokoro/linux-gcc-cmake/build-docker.sh b/kokoro/linux-gcc-cmake/build-docker.sh index 0edc05e24b..5ec64838c7 100755 --- a/kokoro/linux-gcc-cmake/build-docker.sh +++ b/kokoro/linux-gcc-cmake/build-docker.sh @@ -46,5 +46,8 @@ using ninja-1.10.0 echo "Building..." mkdir /build && cd /build -cmake "$ROOT_DIR" -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS +INSTALLDIR="$(pwd)/install" +cmake "$ROOT_DIR" -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS +ctest --output-on-failure ninja install +(cd "$ROOT_DIR"/Test && sh ./runtests /build/localResults "$INSTALLDIR"/bin/glslangValidator "$INSTALLDIR"/bin/spirv-remap)