diff --git a/.travis.yml b/.travis.yml index 1d0140e362..2d718612a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,7 +116,6 @@ script: -DLEAN_EXTRA_MAKE_OPTS=$LEAN_EXTRA_MAKE_OPTS ../src || exit - make -j2 || exit - - export PATH="$TRAVIS_BUILD_DIR/bin:$PATH" - if [[ $TEST != OFF ]]; then yes "A" | ctest -j2 --output-on-failure; fi - if [[ $PACKAGE == TRUE ]]; then cpack; make package; fi - if [[ $TEST_LEANPKG_REGISTRY == ON ]]; then ../script/test_registry.py; fi diff --git a/.travis.yml.in b/.travis.yml.in index f1aa3b653f..950a310476 100644 --- a/.travis.yml.in +++ b/.travis.yml.in @@ -116,7 +116,6 @@ script: -DLEAN_EXTRA_MAKE_OPTS=$LEAN_EXTRA_MAKE_OPTS ../src || exit - make -j2 || exit - - export PATH="$TRAVIS_BUILD_DIR/bin:$PATH" - if [[ $TEST != OFF ]]; then yes "A" | ctest -j2 --output-on-failure; fi - if [[ $PACKAGE == TRUE ]]; then cpack; make package; fi - if [[ $TEST_LEANPKG_REGISTRY == ON ]]; then ../script/test_registry.py; fi diff --git a/script/test_registry.py b/script/test_registry.py index 28a4f40184..78f1e7dca3 100755 --- a/script/test_registry.py +++ b/script/test_registry.py @@ -4,8 +4,10 @@ import json import os import subprocess +script_path = os.path.dirname(os.path.realpath(__file__)) +root_path = os.path.dirname(script_path) + def get_packages(): - script_path = os.path.dirname(os.path.realpath(__file__)) pkg_registry = os.path.join(script_path, "package_registry.json") pkg_json = json.loads(open(pkg_registry, 'r').read()) return pkg_json['packages'] @@ -20,7 +22,7 @@ def git_pull(): subprocess.run(["git", "pull"]) def leanpkg_test(): - proc = subprocess.run(["leanpkg", "test"]) + proc = subprocess.run([os.path.join(root_path, "bin", "leanpkg"), "test"]) if proc.returncode == 0: return True else: @@ -58,5 +60,3 @@ def main(): if __name__ == "__main__": main() - -