use same build folder

qgis · Sep 19, 2017 · baafc4e886ccbb2e22d39d528e331b684cf93b1d · baafc4e
1 parent 8e2770d
commit baafc4e886ccbb2e22d39d528e331b684cf93b1d
Unified Split

Showing with 3 additions and 3 deletions.

+2 −2 .ci/travis/linux/docker-build-test.sh

+1 −1 .ci/travis/travis.ctest
diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh
@@ -26,9 +26,9 @@ export PGDATABASE=qgis_test
 
 /root/QGIS/tests/testdata/provider/testdata_pg.sh
 
-mkdir -p build-docker &&
+mkdir -p build &&
 
-pushd build-docker
+pushd build
 
 cmake \
  -GNinja \

diff --git a/.ci/travis/travis.ctest b/.ci/travis/travis.ctest
@@ -1,5 +1,5 @@
 SET (CTEST_SOURCE_DIRECTORY $ENV{CTEST_BUILD_DIR})
-SET (CTEST_BINARY_DIRECTORY $ENV{CTEST_BUILD_DIR}/build-docker)
+SET (CTEST_BINARY_DIRECTORY $ENV{CTEST_BUILD_DIR}/build)
 #SET (CTEST_SOURCE_DIRECTORY /usr/src/QGIS)
 #SET (CTEST_BINARY_DIRECTORY /usr/src/qgis-build)