From 1db93786ad922932d8e4854fa9506c260785e59a Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Thu, 4 Jan 2024 16:44:49 -0700 Subject: [PATCH] Add check of generatead TribitsHelloWorldRepoVersion.txt file (#597) --- .../TribitsHelloWorld_Tests.cmake | 14 +++++++++++++- ...TribitsHelloWorldRepoVersion.single_version.txt | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 test/core/ExamplesUnitTests/configure_git_mockprogram_files/TribitsHelloWorldRepoVersion.single_version.txt diff --git a/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake b/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake index cd8cdac82..6ab244848 100644 --- a/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake +++ b/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake @@ -40,6 +40,7 @@ tribits_add_advanced_test( TribitsHelloWorld tribits_add_advanced_test( TribitsHelloWorld_config_git_version OVERALL_WORKING_DIRECTORY TEST_NAME OVERALL_NUM_MPI_PROCS 1 + XHOST Windows # We use the 'diff' command below :-( TEST_0 MESSAGE "Copy the project source so we can copy files into it." @@ -72,14 +73,25 @@ tribits_add_advanced_test( TribitsHelloWorld_config_git_version "This is the git commit summary line" ALWAYS_FAIL_ON_NONZERO_RETURN + TEST_4 + CMND diff ARGS + ${CMAKE_CURRENT_SOURCE_DIR}/configure_git_mockprogram_files/TribitsHelloWorldRepoVersion.single_version.txt + BUILD/TribitsHelloWorldRepoVersion.txt + ) -# The above directory structure is: +# NOTES: +# +# * The above directory structure is: # # TribitsHelloWorld_config_git_version/ # TribitsHelloWorld/ # .git/ # .mockprogram_inout.txt # BUILD/ +# +# * We don't use cmake -E compare_files because it does not print the diff, +# just gives a non-zero error code. + tribits_add_advanced_test( TribitsHelloWorld_EXE_DISABLE diff --git a/test/core/ExamplesUnitTests/configure_git_mockprogram_files/TribitsHelloWorldRepoVersion.single_version.txt b/test/core/ExamplesUnitTests/configure_git_mockprogram_files/TribitsHelloWorldRepoVersion.single_version.txt new file mode 100644 index 000000000..df4d477e6 --- /dev/null +++ b/test/core/ExamplesUnitTests/configure_git_mockprogram_files/TribitsHelloWorldRepoVersion.single_version.txt @@ -0,0 +1,3 @@ +*** Base Git Repo: TribitsHelloWorld +a1234tgb [Thu Sep 21 19:19:18 2023 -0400] +This is the git commit summary line