Browse Source

travis: Self-destruct makepanda before testing cmake build

Sam Edwards 9 years ago
parent
commit
53d946ff87
1 changed files with 1 additions and 1 deletions
  1. 1 1
      .travis.yml

+ 1 - 1
.travis.yml

@@ -42,7 +42,7 @@ addons:
     - zlib1g-dev
     - zlib1g-dev
 script:
 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" != "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 && cmake -DHAVE_GTK2=NO -DPYTHON_ARCH_INSTALL_DIR=/pypath -DPYTHON_LIB_INSTALL_DIR=/pypath $FLAGS .. && make -j4 && make install DESTDIR=installdir && LD_LIBRARY_PATH=installdir/usr/local/lib PYTHONPATH=installdir/pypath python ../makepanda/test_imports.py )'
+- '[[ "$BUILDSYSTEM" != "cmake" ]] || ( mkdir build && cd build && mv ../makepanda/test_imports.py . && ../makepanda/selfdestruct.py --yes && cmake -DHAVE_GTK2=NO -DPYTHON_ARCH_INSTALL_DIR=/pypath -DPYTHON_LIB_INSTALL_DIR=/pypath $FLAGS .. && make -j4 && make install DESTDIR=installdir && LD_LIBRARY_PATH=installdir/usr/local/lib PYTHONPATH=installdir/pypath python test_imports.py )'
 notifications:
 notifications:
   irc:
   irc:
     channels:
     channels: