test: fix includetest to use CMAKE_MAKE_PROGRAM (#431)

puleglot · web-flow · commit 39cff3dd6b5d · 2020-06-25T10:35:04.000+02:00
includetest currently fais if, for example, ninja is used as a CMake
generator. Fix it by using CMAKE_MAKE_PROGRAM in the test.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -680,7 +680,7 @@ endif(LIBVNCSERVER_WITH_WEBSOCKETS)
 
 add_test(NAME cargs COMMAND test_cargstest)
 if(UNIX)
-  add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+  add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM})
 endif(UNIX)
 if(FOUND_LIBJPEG_TURBO)
     add_test(NAME turbojpeg COMMAND test_tjunittest)
diff --git a/test/includetest.sh b/test/includetest.sh
@@ -5,10 +5,11 @@
 
 # expects install prefix like /usr as an argument
 PREFIX=$1
+CMAKE_MAKE_PROGRAM=$2
 
 TMPDIR=$(mktemp -d)
 
-make install DESTDIR=$TMPDIR
+DESTDIR="$TMPDIR" $CMAKE_MAKE_PROGRAM install
 
 echo \
 "
@@ -19,6 +20,6 @@ int main()
 {
     return 0;
 }
-" > $TMPDIR/includetest.c
+" > "$TMPDIR"/includetest.c
 
-cc -I $TMPDIR/$PREFIX $TMPDIR/includetest.c
+cc -I "$TMPDIR/$PREFIX" "$TMPDIR"/includetest.c

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,11 @@`
`5`	`5`
`6`	`6`	`# expects install prefix like /usr as an argument`
`7`	`7`	`PREFIX=$1`
	`8`	`+CMAKE_MAKE_PROGRAM=$2`
`8`	`9`
`9`	`10`	`TMPDIR=$(mktemp -d)`
`10`	`11`
`11`		`-make install DESTDIR=$TMPDIR`
	`12`	`+DESTDIR="$TMPDIR" $CMAKE_MAKE_PROGRAM install`
`12`	`13`
`13`	`14`	`echo \`
`14`	`15`	`"`
`@@ -19,6 +20,6 @@ int main()`
`19`	`20`	`{`
`20`	`21`	`return 0;`
`21`	`22`	`}`
`22`		`-" > $TMPDIR/includetest.c`
	`23`	`+" > "$TMPDIR"/includetest.c`
`23`	`24`
`24`		`-cc -I $TMPDIR/$PREFIX $TMPDIR/includetest.c`
	`25`	`+cc -I "$TMPDIR/$PREFIX" "$TMPDIR"/includetest.c`