Merge pull request #20314 from spevans/pr_cmake_show_test_failure

swift-ci · web-flow · commit 733377fe1737 · 2018-11-05T09:41:58.000-08:00
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -3181,6 +3181,7 @@ for host in "${ALL_HOSTS[@]}"; do
                 )
 
                 [[ -z "${DISTCC}" ]] || EXTRA_DISTCC_OPTIONS=("DISTCC_HOSTS=localhost,lzo,cpp")
+                export CTEST_OUTPUT_ON_FAILURE=1
                 with_pushd "$(build_directory ${host} foundation)" \
                     call env "${EXTRA_DISTCC_OPTIONS[@]}" "${CMAKE}" "${cmake_options[@]}" "${EXTRA_CMAKE_OPTIONS[@]}" "${FOUNDATION_SOURCE_DIR}"
 

Original file line number	Diff line number	Diff line change
`@@ -3181,6 +3181,7 @@ for host in "${ALL_HOSTS[@]}"; do`
`3181`	`3181`	`)`
`3182`	`3182`
`3183`	`3183`	`[[ -z "${DISTCC}" ]] \|\| EXTRA_DISTCC_OPTIONS=("DISTCC_HOSTS=localhost,lzo,cpp")`
	`3184`	`+ export CTEST_OUTPUT_ON_FAILURE=1`
`3184`	`3185`	`with_pushd "$(build_directory ${host} foundation)" \`
`3185`	`3186`	`call env "${EXTRA_DISTCC_OPTIONS[@]}" "${CMAKE}" "${cmake_options[@]}" "${EXTRA_CMAKE_OPTIONS[@]}" "${FOUNDATION_SOURCE_DIR}"`
`3186`	`3187`