olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix test running

This commit is contained in:
Eric Wasylishen 2017-03-06 13:54:46 -07:00
parent f45a1a715d
commit 72e7a7b687
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -22,7 +22,7 @@ build_script:
cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.14.0.win32.windows/lib/cmake/embree-2.14.0"
}
msbuild check.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
msbuild testlight.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
msbuild PACKAGE.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

4
build-linux-64.sh
View File

@ -13,11 +13,11 @@ wget https://github.com/embree/embree/releases/download/v2.14.0/embree-2.14.0.x8
tar xf embree.tgz
cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.14.0.x86_64.linux/lib/cmake/embree-2.14.0"
make -j8 VERBOSE=1
make -j8 VERBOSE=1 check
make -j8 VERBOSE=1 testlight
cpack
# run tests
./testlight/testlight || exit 1
./light/testlight || exit 1
# check rpath
readelf -d ./light/light

4
build-osx.sh
View File

@ -18,8 +18,8 @@ tar xf "$EMBREE_TGZ_NAME"
EMBREE_CMAKE_DIR="$(pwd)/$EMBREE_DIR_NAME/lib/cmake/$EMBREE_WITH_VERSION"
cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$EMBREE_CMAKE_DIR"
make -j8
make -j8 check
make -j8 testlight
cpack
# run tests
./testlight/testlight || exit 1
./light/testlight || exit 1