From f79d991dfd607a6444fe5636fc264cc204fcb2ea Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 2 Feb 2021 19:10:52 -0500
Subject: [PATCH] Tests: Convert CMake.ELF to RunCMake.file-RPATH ELF case

---
 Tests/CMakeTests/CMakeLists.txt                    |   4 ----
 Tests/RunCMake/CMakeLists.txt                      |   3 +++
 .../file-RPATH/Common.cmake}                       |  13 ++-----------
 Tests/RunCMake/file-RPATH/ELF.cmake                |   9 +++++++++
 .../file-RPATH}/ELF/elf32lsb.bin                   | Bin
 .../file-RPATH}/ELF/elf32msb.bin                   | Bin
 .../file-RPATH}/ELF/elf64lsb.bin                   | Bin
 .../file-RPATH}/ELF/elf64msb.bin                   | Bin
 Tests/RunCMake/file-RPATH/RunCMakeTest.cmake       |   5 +++++
 9 files changed, 19 insertions(+), 15 deletions(-)
 rename Tests/{CMakeTests/ELFTest.cmake.in => RunCMake/file-RPATH/Common.cmake} (89%)
 create mode 100644 Tests/RunCMake/file-RPATH/ELF.cmake
 rename Tests/{CMakeTests => RunCMake/file-RPATH}/ELF/elf32lsb.bin (100%)
 mode change 100644 => 100755
 rename Tests/{CMakeTests => RunCMake/file-RPATH}/ELF/elf32msb.bin (100%)
 mode change 100644 => 100755
 rename Tests/{CMakeTests => RunCMake/file-RPATH}/ELF/elf64lsb.bin (100%)
 mode change 100644 => 100755
 rename Tests/{CMakeTests => RunCMake/file-RPATH}/ELF/elf64msb.bin (100%)
 mode change 100644 => 100755
 create mode 100644 Tests/RunCMake/file-RPATH/RunCMakeTest.cmake

diff --git a/Tests/CMakeTests/CMakeLists.txt b/Tests/CMakeTests/CMakeLists.txt
index 348e6d05d0..6bbbe7d355 100644
--- a/Tests/CMakeTests/CMakeLists.txt
+++ b/Tests/CMakeTests/CMakeLists.txt
@@ -44,10 +44,6 @@ set_property(TEST CMake.FileDownloadBadHash PROPERTY
 
 AddCMakeTest(FileUpload "")
 
-if(HAVE_ELF_H)
-  AddCMakeTest(ELF "")
-endif()
-
 set(EndStuff_PreArgs
   "-Ddir:STRING=${CMAKE_CURRENT_BINARY_DIR}/EndStuffTest"
   )
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index f58e2f390b..e0804d783e 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -358,6 +358,9 @@ add_RunCMake_test(ctest_upload)
 add_RunCMake_test(ctest_fixtures)
 add_RunCMake_test(file)
 add_RunCMake_test(file-CHMOD)
+if(HAVE_ELF_H)
+  add_RunCMake_test(file-RPATH -DHAVE_ELF_H=${HAVE_ELF_H})
+endif()
 add_RunCMake_test(find_file)
 add_RunCMake_test(find_library -DCYGWIN=${CYGWIN})
 add_RunCMake_test(find_package)
diff --git a/Tests/CMakeTests/ELFTest.cmake.in b/Tests/RunCMake/file-RPATH/Common.cmake
similarity index 89%
rename from Tests/CMakeTests/ELFTest.cmake.in
rename to Tests/RunCMake/file-RPATH/Common.cmake
index 85c2360d37..cc1efb5334 100644
--- a/Tests/CMakeTests/ELFTest.cmake.in
+++ b/Tests/RunCMake/file-RPATH/Common.cmake
@@ -1,15 +1,6 @@
-set(names
-  elf32lsb.bin
-  elf32msb.bin
-  elf64lsb.bin
-  elf64msb.bin
-  )
-
 # Prepare binaries on which to operate.
-set(in "@CMAKE_CURRENT_SOURCE_DIR@/ELF")
-set(out "@CMAKE_CURRENT_BINARY_DIR@/ELF-Out")
-file(REMOVE_RECURSE "${out}")
-file(MAKE_DIRECTORY "${out}")
+set(in "${CMAKE_CURRENT_LIST_DIR}/${format}")
+set(out "${CMAKE_CURRENT_BINARY_DIR}")
 foreach(f ${names})
   file(COPY ${in}/${f} DESTINATION ${out} NO_SOURCE_PERMISSIONS)
   list(APPEND files "${out}/${f}")
diff --git a/Tests/RunCMake/file-RPATH/ELF.cmake b/Tests/RunCMake/file-RPATH/ELF.cmake
new file mode 100644
index 0000000000..558b2e2644
--- /dev/null
+++ b/Tests/RunCMake/file-RPATH/ELF.cmake
@@ -0,0 +1,9 @@
+set(names
+  elf32lsb.bin
+  elf32msb.bin
+  elf64lsb.bin
+  elf64msb.bin
+  )
+set(format ELF)
+
+include(${CMAKE_CURRENT_LIST_DIR}/Common.cmake)
diff --git a/Tests/CMakeTests/ELF/elf32lsb.bin b/Tests/RunCMake/file-RPATH/ELF/elf32lsb.bin
old mode 100644
new mode 100755
similarity index 100%
rename from Tests/CMakeTests/ELF/elf32lsb.bin
rename to Tests/RunCMake/file-RPATH/ELF/elf32lsb.bin
diff --git a/Tests/CMakeTests/ELF/elf32msb.bin b/Tests/RunCMake/file-RPATH/ELF/elf32msb.bin
old mode 100644
new mode 100755
similarity index 100%
rename from Tests/CMakeTests/ELF/elf32msb.bin
rename to Tests/RunCMake/file-RPATH/ELF/elf32msb.bin
diff --git a/Tests/CMakeTests/ELF/elf64lsb.bin b/Tests/RunCMake/file-RPATH/ELF/elf64lsb.bin
old mode 100644
new mode 100755
similarity index 100%
rename from Tests/CMakeTests/ELF/elf64lsb.bin
rename to Tests/RunCMake/file-RPATH/ELF/elf64lsb.bin
diff --git a/Tests/CMakeTests/ELF/elf64msb.bin b/Tests/RunCMake/file-RPATH/ELF/elf64msb.bin
old mode 100644
new mode 100755
similarity index 100%
rename from Tests/CMakeTests/ELF/elf64msb.bin
rename to Tests/RunCMake/file-RPATH/ELF/elf64msb.bin
diff --git a/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake b/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake
new file mode 100644
index 0000000000..11e90bbc9b
--- /dev/null
+++ b/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake
@@ -0,0 +1,5 @@
+include(RunCMake)
+
+if(HAVE_ELF_H)
+  run_cmake_command(ELF ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/ELF.cmake)
+endif()