diff --git a/contrib/TestHarness/CMakeLists.txt b/contrib/TestHarness/CMakeLists.txt index 4eecd82e04..e6eed2d630 100644 --- a/contrib/TestHarness/CMakeLists.txt +++ b/contrib/TestHarness/CMakeLists.txt @@ -1,5 +1,6 @@ set(SRCS - ${CMAKE_CURRENT_BINARY_DIR}/Program.cs + ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.cs + ${CMAKE_CURRENT_SOURCE_DIR}/Program.cs Properties/AssemblyInfo.cs) set(TEST_HARNESS_REFERENCES @@ -7,7 +8,7 @@ set(TEST_HARNESS_REFERENCES set(out_file ${CMAKE_BINARY_DIR}/packages/bin/TestHarness.exe) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Program.cs.cmake ${CMAKE_CURRENT_BINARY_DIR}/Program.cs) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/VersionInfo.cs.cmake ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.cs) add_custom_command(OUTPUT ${out_file} COMMAND ${MCS_EXECUTABLE} ARGS ${TEST_HARNESS_REFERENCES} ${SRCS} "-target:exe" "-out:${out_file}" diff --git a/contrib/TestHarness/Program.cs.cmake b/contrib/TestHarness/Program.cs similarity index 99% rename from contrib/TestHarness/Program.cs.cmake rename to contrib/TestHarness/Program.cs index 8f9843e4c9..2955072fce 100644 --- a/contrib/TestHarness/Program.cs.cmake +++ b/contrib/TestHarness/Program.cs @@ -160,7 +160,7 @@ namespace SummarizeTest } else if (args[0] == "version") { - return VersionInfo(); + return VersionInfo.Show(); } return UsageMessage(); @@ -1633,16 +1633,6 @@ namespace SummarizeTest } } - private static int VersionInfo() - { - Console.WriteLine("Version: 1.02"); - - Console.WriteLine("FDB Project Ver: " + "${FDB_VERSION}"); - Console.WriteLine("FDB Version: " + "${FDB_VERSION_MAJOR}" + "." + "${FDB_VERSION_MINOR}"); - Console.WriteLine("Source Version: " + "${CURRENT_GIT_VERSION}"); - return 1; - } - private static int UsageMessage() { Console.WriteLine("Usage:"); @@ -1653,7 +1643,7 @@ namespace SummarizeTest Console.WriteLine(" TestHarness remote [queue folder] [root foundation folder] [duration in hours] [amount of tests] [all/fast/] [scope]"); Console.WriteLine(" TestHarness extract-errors [summary-file] [error-summary-file]"); Console.WriteLine(" TestHarness joshua-run "); - VersionInfo(); + VersionInfo.Show(); return 1; } } diff --git a/contrib/TestHarness/VersionInfo.cs.cmake b/contrib/TestHarness/VersionInfo.cs.cmake new file mode 100644 index 0000000000..019234727e --- /dev/null +++ b/contrib/TestHarness/VersionInfo.cs.cmake @@ -0,0 +1,15 @@ +using System; + +namespace SummarizeTest { + static class VersionInfo { + public static int Show() + { + Console.WriteLine("Version: 1.02"); + + Console.WriteLine("FDB Project Ver: " + "${FDB_VERSION}"); + Console.WriteLine("FDB Version: " + "${FDB_VERSION_MAJOR}" + "." + "${FDB_VERSION_MINOR}"); + Console.WriteLine("Source Version: " + "${CURRENT_GIT_VERSION}"); + return 1; + } + } +} \ No newline at end of file