From a03fef59cda49f8e58ec7840f2ee40a2cb0a4791 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Thu, 8 Feb 2018 15:03:10 -0700 Subject: [PATCH] travis: Use a consistent output directory for makepanda/cmake output --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f48634bcd..cf9279a716 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ install: - $PYTHONV -m pip install pytest script: - '[[ "$BUILDSYSTEM" != "makepanda" ]] || ( $PYTHONV makepanda/makepanda.py --everything --git-commit $TRAVIS_COMMIT $FLAGS --threads 4 && LD_LIBRARY_PATH=built/lib PYTHONPATH=built $PYTHONV makepanda/test_imports.py )' - - '[[ "$BUILDSYSTEM" != "cmake" ]] || ( mkdir build && cd build && mv ../makepanda/test_imports.py . && ../makepanda/selfdestruct.py --yes && cmake -DHAVE_GTK2=NO $FLAGS .. && make -j4 && $PYTHONV test_imports.py && cd .. )' + - '[[ "$BUILDSYSTEM" != "cmake" ]] || ( mkdir built && cd built && mv ../makepanda/test_imports.py . && ../makepanda/selfdestruct.py --yes && cmake -DHAVE_GTK2=NO $FLAGS .. && make -j4 && $PYTHONV test_imports.py && cd .. )' - LD_LIBRARY_PATH=built/lib PYTHONPATH=built $PYTHONV -m pytest tests notifications: irc: