From 466c13959751c5a32260bd5c1345535ca3cd0e64 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 29 Mar 2011 10:15:02 -0500
Subject: [svn-r20363] Updated commands to properly clear generated files
Tested: local linux
---
tools/h5copy/CMakeLists.txt | 2 +-
tools/h5import/CMakeLists.txt | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index 7c008a3..8a6ca11 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -329,10 +329,10 @@ IF (BUILD_TESTING)
NAME H5COPY-clear-misc
COMMAND ${CMAKE_COMMAND}
-E remove
- ./testfiles/h5copy_misc1.out.h5
./testfiles/h5copy_misc1.out.out
./testfiles/h5copy_misc1.out.out.err
./testfiles/${HDF_FILE1_TMP}.h5
+ ./testfiles/h5copy_misc1.out.h5
)
IF (NOT "${last_test}" STREQUAL "")
SET_TESTS_PROPERTIES (H5COPY-clear-misc PROPERTIES DEPENDS ${last_test})
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index 3c5cbe0..9d4ec1b 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -195,12 +195,9 @@ IF (BUILD_TESTING)
txtin16.txt
txtin32.txt
)
- SET (last_test "H5IMPORT-clear-objects")
ADD_TEST (NAME H5IMPORT-h5importtest COMMAND $<TARGET_FILE:h5importtest>)
- IF (NOT "${last_test}" STREQUAL "")
- SET_TESTS_PROPERTIES (H5IMPORT-h5importtest PROPERTIES DEPENDS ${last_test})
- ENDIF (NOT "${last_test}" STREQUAL "")
+ SET_TESTS_PROPERTIES (H5IMPORT-h5importtest PROPERTIES DEPENDS H5IMPORT-clear-objects)
SET (last_test "H5IMPORT-h5importtest")
# ----- TESTING "ASCII I32 rank 3 - Output BE " ;
--
cgit v0.12