[checkmk-commits] Fix sequential build of Googletest

Module: check_mk Branch: master Commit: ebb2b16f4af5aa4a2352cf903df4b66fe7863aef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebb2b16f4af5aa… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Oct 18 16:13:34 2017 +0200 Fix sequential build of Googletest After disabling parallel build, changing directory back to parent was broken. Change-Id: I2de6bc473379524f8eb78072f62e719d5fd22841 --- agents/windows/chroot_version | 2 +- agents/windows/test/build-googletest | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index b8626c4..7ed6ff8 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -4 +5 diff --git a/agents/windows/test/build-googletest b/agents/windows/test/build-googletest index 0255c60..caa90d7 100755 --- a/agents/windows/test/build-googletest +++ b/agents/windows/test/build-googletest @@ -25,16 +25,14 @@ for project in test mock ; do autoreconf --install for arch in 32 64 ; do build $arch - #& done - #wait # make install is not supported by Google -> copy headers and libs cp -r include/g${project} /usr/share/mingw-w64/include/ for arch in 32 64 ; do cp ${builddirs[$arch]}/lib/.libs/libg${project}.a /usr/${archs[$arch]}${common}/lib/ ln -sf ../../share/mingw-w64/include/g${project} /usr/${archs[$arch]}${common}/include/g${project} done - cd - + cd .. done cd ..