Skip to content

Commit eb43b40

Browse files
committed
In travis build unit tests with the installed library.
1 parent 696e014 commit eb43b40

1 file changed

Lines changed: 13 additions & 14 deletions

File tree

.travis.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,21 @@ install:
7979
- $NOMC || MYCONDATESTENV="$(ls -td ~/mc/conda-bld/conda-recipe_*/_t_env | head -1)"
8080
- $NOMC || source activate ${MYCONDATESTENV:?"conda test environment not found"}
8181
- $NOMC || conda list --export ${MYNAME} > /tmp/mypackage.txt
82+
- $NOMC || source activate root
83+
- $NOMC || conda build purge
8284
- $NOMC || source activate testenv
8385
- $NOMC || conda install --yes --use-local --file=/tmp/mypackage.txt
8486
- $NOMC || conda install --yes cxxtest scons
8587
- $NOMC || MYPREFIX="${HOME}/mc/envs/testenv"
86-
- $NOMC || MYWORKDIR="${HOME}/mc/conda-bld/work"
8788

8889
- $NOAPT || sudo scons -C ~/pkgs/libobjcryst install
8990
- $NOAPT || cd ~/pkgs/"$(basename "${MYTARBUNDLE}" .tar.gz)"/
90-
- $NOAPT || scons build=fast alltests
91+
- $NOAPT || scons build=fast lib
9192
- $NOAPT || sudo scons build=fast install
93+
- $NOAPT || scons -Q build=fast --clean lib
9294
- $NOAPT || MYPREFIX=/usr/local
93-
- $NOAPT || MYWORKDIR=$PWD
9495

95-
# Ensure libdiffpy cannot be loaded from the work directory.
96-
- scons build=fast -Q -C ${MYWORKDIR} --clean lib
97-
- MYALLTESTSFAST=$(ls -t ${MYWORKDIR}/build/fast*/tests/alltests | head -1)
96+
# Verify version of the installed library.
9897
- MYINCLUDE="${MYPREFIX}/include"
9998
- MYLIB="${MYPREFIX}/lib"
10099
- MYVERSION="${MYINCLUDE}/diffpy/version.hpp"
@@ -104,28 +103,28 @@ install:
104103
exit 1;
105104
fi
106105

107-
- $NOMC || export LIBRARY_PATH="${MYLIB}"
108-
- $NOMC || export CPATH="${MYINCLUDE}"
109-
110-
# Mac OS X must use the same deployment target as conda-build.
106+
# Mac OS X must use the same deployment target as conda-build.
111107
- if $MYUSEMC && [[ "${TRAVIS_OS_NAME}" == osx ]]; then
112108
export MACOSX_DEPLOYMENT_TARGET=10.7;
113109
fi
114110

115-
# Linux ld linker requires that libraries can be resolved at link time.
111+
# Linux ld linker requires that libraries can be resolved at link time.
116112
- if ${MYUSEMC} && [[ "${TRAVIS_OS_NAME}" == linux ]]; then
117113
export LD_LIBRARY_PATH="${MYLIB}";
118114
fi
119115

120-
- scons build=debug alltests
116+
- scons build=debug prefix="${MYPREFIX}" test_installed=true alltests
117+
- scons build=fast prefix="${MYPREFIX}" test_installed=true alltests
118+
- MYALLTESTSFAST=$(ls -t ${PWD}/build/fast*/tests/alltests | head -1)
121119

122120

123121
before_script:
124122

125123

126124
script:
127-
- scons build=debug -Q test
128-
- scons build=debug enable_objcryst=false -Q test
125+
- scons -Q build=debug prefix="${MYPREFIX}" test_installed=true test
126+
- scons -Q build=debug prefix="${MYPREFIX}" test_installed=true
127+
enable_objcryst=false test
129128
- ${MYALLTESTSFAST}
130129

131130

0 commit comments

Comments
 (0)