|
Line
Link Here
|
| 0 |
-- virtualx.eclass |
0 |
++ virtualx.eclass |
|
Lines 144-150
Link Here
|
| 144 |
# Do not break on error, but setup $retval, as we need |
144 |
# Do not break on error, but setup $retval, as we need |
| 145 |
# to kill Xvfb |
145 |
# to kill Xvfb |
| 146 |
debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" |
146 |
debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" |
| 147 |
${VIRTUALX_COMMAND} "$@" |
147 |
nonfatal ${VIRTUALX_COMMAND} "$@" |
| 148 |
retval=$? |
148 |
retval=$? |
| 149 |
|
149 |
|
| 150 |
# Now kill Xvfb |
150 |
# Now kill Xvfb |
| 151 |
-- cmake-utils.eclass |
151 |
++ cmake-utils.eclass |
|
Lines 442-447
Link Here
|
| 442 |
|
442 |
|
| 443 |
if ctest ${ctestargs} "$@" ; then |
443 |
if ctest ${ctestargs} "$@" ; then |
| 444 |
einfo "Tests succeeded." |
444 |
einfo "Tests succeeded." |
|
|
445 |
popd > /dev/null |
| 446 |
return 0 |
| 445 |
else |
447 |
else |
| 446 |
if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then |
448 |
if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then |
| 447 |
# on request from Diego |
449 |
# on request from Diego |
|
Lines 453-460
Link Here
|
| 453 |
else |
455 |
else |
| 454 |
die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" |
456 |
die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" |
| 455 |
fi |
457 |
fi |
|
|
458 |
|
| 459 |
# die might not die due to nonfatal |
| 460 |
popd > /dev/null |
| 461 |
return 1 |
| 456 |
fi |
462 |
fi |
| 457 |
popd > /dev/null |
|
|
| 458 |
} |
463 |
} |
| 459 |
|
464 |
|
| 460 |
# @FUNCTION: cmake-utils_src_configure |
465 |
# @FUNCTION: cmake-utils_src_configure |
