Skip to content

Commit dba7673

Browse files
committed
Fix umf_standalone_examples test
Build and install UMF in new directories created inside CMAKE_CURRENT_BINARY_DIR. Fixes: #674 Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 352bb22 commit dba7673

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

test/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ if(LINUX
446446
COMMAND
447447
${UMF_CMAKE_SOURCE_DIR}/test/test_examples.sh
448448
${UMF_CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
449-
${CMAKE_INSTALL_PREFIX} ${EXAMPLES}
449+
${CMAKE_CURRENT_BINARY_DIR}/umf_standalone_examples/install-dir
450+
"${CMAKE_INSTALL_PREFIX}" ${EXAMPLES}
450451
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
451452
endif()
452453
endif()

test/test_examples.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,23 @@ set -e
88
SOURCE_DIR=$1
99
BUILD_DIR=$2
1010
INSTALL_DIR=$3
11+
CMAKE_INSTALL_PREFIX=$4
1112

1213
echo "Running: $0 $*"
1314

1415
function print_usage() {
1516
echo "$(basename $0) - test all examples standalone"
16-
echo "Usage: $(basename $0) <source_dir> <build_dir> <install_dir> <list-of-examples-to-run>"
17+
echo "Usage: $(basename $0) <source_dir> <build_dir> <install_dir> <CMAKE_INSTALL_PREFIX> <list-of-examples-to-run>"
1718
}
1819

20+
# CMAKE_INSTALL_PREFIX can be the empty string ""
1921
if [ "$3" == "" ]; then
2022
print_usage
2123
echo -e "Error: too few arguments\n"
2224
exit 1
2325
fi
2426

25-
if [ "$4" == "" ]; then
27+
if [ "$5" == "" ]; then
2628
print_usage
2729
echo "No examples to run!"
2830
exit 0
@@ -34,11 +36,18 @@ if [ ! -f $SOURCE_DIR/README.md ]; then
3436
exit 1
3537
fi
3638

39+
[ ! -d ${INSTALL_DIR}/${CMAKE_INSTALL_PREFIX} ] && mkdir -p ${INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}
40+
3741
SOURCE_DIR=$(realpath $SOURCE_DIR)
3842
BUILD_DIR=$(realpath $BUILD_DIR)
3943
INSTALL_DIR=$(realpath $INSTALL_DIR)
4044

41-
shift 3
45+
echo "SOURCE_DIR=$SOURCE_DIR"
46+
echo "BUILD_DIR=$BUILD_DIR"
47+
echo "CMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX"
48+
echo "INSTALL_DIR=$INSTALL_DIR"
49+
50+
shift 4
4251
EXAMPLES="$*"
4352
echo "Examples to run: $EXAMPLES"
4453
echo
@@ -47,7 +56,7 @@ cd ${BUILD_DIR}
4756
echo "DIR=$(pwd)"
4857

4958
set -x
50-
make -j$(nproc) install
59+
make DESTDIR=$INSTALL_DIR -j$(nproc) install
5160
set +x
5261

5362
for ex in $EXAMPLES; do
@@ -67,7 +76,7 @@ for ex in $EXAMPLES; do
6776
rm -rf $BLD_DIR
6877
mkdir -p $BLD_DIR
6978
cd $BLD_DIR
70-
CMAKE_PREFIX_PATH="$INSTALL_DIR" cmake $SRC_DIR
79+
CMAKE_PREFIX_PATH="${INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}" cmake $SRC_DIR
7180
make -j$(nproc)
7281
ctest --output-on-failure
7382
set +x

0 commit comments

Comments
 (0)