From a9baf8faed7d9a6bd2804dbd1c514f6cbc3b10ef Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Tue, 10 Feb 2015 10:10:15 -0700 Subject: [PATCH] Make test file name separators consistent Some of the files in the tests directory used a dash to separate words (e.g. test-config.h and test-util.h) whereas others used an underscore (e.g. test_codes.h and mpi_comm.h). Renamed the files such that they all use underscores, which matches better the filenames used elsewhere. --- tests/BackgroundCorrect.c | 2 +- tests/BlankTiles.c | 2 +- tests/BoundsBehindViewer.c | 2 +- tests/CMakeLists.txt | 6 +++--- tests/CompressionSize.c | 2 +- tests/DisplayNoDraw.c | 2 +- tests/FloatingViewport.c | 2 +- tests/Interlace.c | 2 +- tests/MaxImageSplit.c | 2 +- tests/OddImageSizes.c | 2 +- tests/OddProcessCounts.c | 2 +- tests/PreRender.c | 2 +- tests/RadixkUnitTests.c | 2 +- tests/RandomTransform.c | 2 +- tests/RenderEmpty.c | 2 +- tests/SimpleExample.c | 2 +- tests/SimpleTiming.c | 2 +- tests/SparseImageCopy.c | 2 +- tests/init.c | 2 +- tests/mpi_comm.h | 2 +- tests/ppm.c | 2 +- tests/{test-config.h.in => test_config.h.in} | 0 tests/{test-util.h => test_util.h} | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) rename tests/{test-config.h.in => test_config.h.in} (100%) rename tests/{test-util.h => test_util.h} (98%) diff --git a/tests/BackgroundCorrect.c b/tests/BackgroundCorrect.c index bcd95ad..44366ce 100644 --- a/tests/BackgroundCorrect.c +++ b/tests/BackgroundCorrect.c @@ -13,7 +13,7 @@ #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/BlankTiles.c b/tests/BlankTiles.c index 59d727b..d78887a 100644 --- a/tests/BlankTiles.c +++ b/tests/BlankTiles.c @@ -9,7 +9,7 @@ *****************************************************************************/ #include -#include "test-util.h" +#include "test_util.h" #include "test_codes.h" #include diff --git a/tests/BoundsBehindViewer.c b/tests/BoundsBehindViewer.c index a43592b..799c14a 100644 --- a/tests/BoundsBehindViewer.c +++ b/tests/BoundsBehindViewer.c @@ -10,7 +10,7 @@ *****************************************************************************/ #include -#include "test-util.h" +#include "test_util.h" #include "test_codes.h" #include diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b2069a9..c520876 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -71,7 +71,7 @@ SET(UTIL_SRCS init.c ppm.c) SET(TEST_HEADERS test_codes.h - test-util.h + test_util.h mpi_comm.h ) SET_SOURCE_FILES_PROPERTIES(${TEST_HEADERS} @@ -79,8 +79,8 @@ SET_SOURCE_FILES_PROPERTIES(${TEST_HEADERS} ) CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/test-config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/test-config.h + ${CMAKE_CURRENT_SOURCE_DIR}/test_config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/test_config.h ) INCLUDE_DIRECTORIES( diff --git a/tests/CompressionSize.c b/tests/CompressionSize.c index 949cc36..a530b82 100644 --- a/tests/CompressionSize.c +++ b/tests/CompressionSize.c @@ -10,7 +10,7 @@ *****************************************************************************/ #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/DisplayNoDraw.c b/tests/DisplayNoDraw.c index 4d0cfc2..af796e4 100644 --- a/tests/DisplayNoDraw.c +++ b/tests/DisplayNoDraw.c @@ -16,7 +16,7 @@ #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/FloatingViewport.c b/tests/FloatingViewport.c index 29327f9..061a474 100644 --- a/tests/FloatingViewport.c +++ b/tests/FloatingViewport.c @@ -12,7 +12,7 @@ #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/Interlace.c b/tests/Interlace.c index 3e628ec..2b9ff97 100644 --- a/tests/Interlace.c +++ b/tests/Interlace.c @@ -11,7 +11,7 @@ *****************************************************************************/ #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include diff --git a/tests/MaxImageSplit.c b/tests/MaxImageSplit.c index 53cad2b..064dc14 100644 --- a/tests/MaxImageSplit.c +++ b/tests/MaxImageSplit.c @@ -12,7 +12,7 @@ #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/OddImageSizes.c b/tests/OddImageSizes.c index 33d8e3d..5e07a54 100644 --- a/tests/OddImageSizes.c +++ b/tests/OddImageSizes.c @@ -11,7 +11,7 @@ #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/OddProcessCounts.c b/tests/OddProcessCounts.c index 423044f..927153d 100644 --- a/tests/OddProcessCounts.c +++ b/tests/OddProcessCounts.c @@ -11,7 +11,7 @@ #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/PreRender.c b/tests/PreRender.c index c34f4e2..05cd010 100644 --- a/tests/PreRender.c +++ b/tests/PreRender.c @@ -13,7 +13,7 @@ #include #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/RadixkUnitTests.c b/tests/RadixkUnitTests.c index db06891..19363bd 100644 --- a/tests/RadixkUnitTests.c +++ b/tests/RadixkUnitTests.c @@ -10,7 +10,7 @@ #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include diff --git a/tests/RandomTransform.c b/tests/RandomTransform.c index c585fce..30c831c 100644 --- a/tests/RandomTransform.c +++ b/tests/RandomTransform.c @@ -14,7 +14,7 @@ #include #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/RenderEmpty.c b/tests/RenderEmpty.c index 6b69d6a..87688f9 100644 --- a/tests/RenderEmpty.c +++ b/tests/RenderEmpty.c @@ -12,7 +12,7 @@ #include #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include diff --git a/tests/SimpleExample.c b/tests/SimpleExample.c index fb419d2..71b82d9 100644 --- a/tests/SimpleExample.c +++ b/tests/SimpleExample.c @@ -10,7 +10,7 @@ *****************************************************************************/ #include -#include "test-util.h" +#include "test_util.h" #include "test_codes.h" #include diff --git a/tests/SimpleTiming.c b/tests/SimpleTiming.c index 49d506b..0ba8f99 100644 --- a/tests/SimpleTiming.c +++ b/tests/SimpleTiming.c @@ -13,7 +13,7 @@ #include #include #include -#include "test-util.h" +#include "test_util.h" #include "test_codes.h" #include diff --git a/tests/SparseImageCopy.c b/tests/SparseImageCopy.c index d4fff22..3837b6e 100644 --- a/tests/SparseImageCopy.c +++ b/tests/SparseImageCopy.c @@ -10,7 +10,7 @@ *****************************************************************************/ #include "test_codes.h" -#include "test-util.h" +#include "test_util.h" #include diff --git a/tests/init.c b/tests/init.c index c1b1ab3..d93ae00 100644 --- a/tests/init.c +++ b/tests/init.c @@ -7,7 +7,7 @@ * This source code is released under the New BSD License. */ -#include "test-util.h" +#include "test_util.h" #include "test_codes.h" #ifdef ICET_TESTS_USE_OPENGL diff --git a/tests/mpi_comm.h b/tests/mpi_comm.h index cedc661..d5d391a 100644 --- a/tests/mpi_comm.h +++ b/tests/mpi_comm.h @@ -10,7 +10,7 @@ #ifndef _MPI_COMM_H_ #define _MPI_COMM_H_ -#include "test-util.h" +#include "test_util.h" #include void init_mpi_comm(int *argcp, char ***argvp) diff --git a/tests/ppm.c b/tests/ppm.c index b956457..bcab5c4 100644 --- a/tests/ppm.c +++ b/tests/ppm.c @@ -7,7 +7,7 @@ * This source code is released under the New BSD License. */ -#include "test-util.h" +#include "test_util.h" #include #include diff --git a/tests/test-config.h.in b/tests/test_config.h.in similarity index 100% rename from tests/test-config.h.in rename to tests/test_config.h.in diff --git a/tests/test-util.h b/tests/test_util.h similarity index 98% rename from tests/test-util.h rename to tests/test_util.h index 0eaede9..cd1b834 100644 --- a/tests/test-util.h +++ b/tests/test_util.h @@ -10,7 +10,7 @@ #ifndef _TEST_UTIL_H_ #define _TEST_UTIL_H_ -#include "test-config.h" +#include "test_config.h" #ifdef __cplusplus extern "C" { -- GitLab