Skip to content

Commit 09a7404

Browse files
hjmjohnsondzenanz
authored andcommitted
COMP: Auto-remove transient test outputs via FIXTURES_CLEANUP companion tests
Wire the existing itk_add_file_test_cleanup() helper into the tests whose outputs were just made unique. Each gains a FIXTURES_CLEANUP companion test that removes its ${ITK_TEST_OUTPUT_DIR} outputs after the test runs. The controlling option ITK_REMOVE_TEST_FILES_ON_SUCCESS defaults to ON, so cleanup is active by default; set it OFF to retain outputs for debugging. Per CMake, FIXTURES_CLEANUP runs regardless of whether the fixture test passed, failed, or was skipped.
1 parent a21cf82 commit 09a7404

12 files changed

Lines changed: 100 additions & 0 deletions

File tree

Modules/Filtering/IsotropicWavelets/test/CMakeLists.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,10 @@ itk_add_test(
429429
"Held"
430430
2
431431
)
432+
itk_add_file_test_cleanup(
433+
itkIsotropicWaveletFrequencyFunctionHeldTest
434+
${ITK_TEST_OUTPUT_DIR}/profileMotherWaveletHeld
435+
)
432436
itk_add_test(
433437
NAME itkIsotropicWaveletFrequencyFunctionShannonTest
434438
COMMAND
@@ -440,6 +444,10 @@ itk_add_test(
440444
"Shannon"
441445
2
442446
)
447+
itk_add_file_test_cleanup(
448+
itkIsotropicWaveletFrequencyFunctionShannonTest
449+
${ITK_TEST_OUTPUT_DIR}/profileMotherWaveletShannon
450+
)
443451
itk_add_test(
444452
NAME itkIsotropicWaveletFrequencyFunctionSimoncelliTest
445453
COMMAND
@@ -451,6 +459,10 @@ itk_add_test(
451459
"Simoncelli"
452460
2
453461
)
462+
itk_add_file_test_cleanup(
463+
itkIsotropicWaveletFrequencyFunctionSimoncelliTest
464+
${ITK_TEST_OUTPUT_DIR}/profileMotherWaveletSimoncelli
465+
)
454466
itk_add_test(
455467
NAME itkIsotropicWaveletFrequencyFunctionVowTest
456468
COMMAND
@@ -462,6 +474,10 @@ itk_add_test(
462474
"Vow"
463475
2
464476
)
477+
itk_add_file_test_cleanup(
478+
itkIsotropicWaveletFrequencyFunctionVowTest
479+
${ITK_TEST_OUTPUT_DIR}/profileMotherWaveletVow
480+
)
465481

466482
itk_add_test(
467483
NAME itkHeldIsotropicWaveletTest
@@ -606,6 +622,11 @@ itk_add_test(
606622
3
607623
NoApply
608624
)
625+
itk_add_file_test_cleanup(
626+
itkWaveletCoeffsPhaseAnalyzisImageFilterTest
627+
${ITK_TEST_OUTPUT_DIR}/vol11-16_16_16_L2_B2_S2.nrrd
628+
${ITK_TEST_OUTPUT_DIR}/vol11-16_16_16.nrrd
629+
)
609630
## WaveletCoeffsSpatialDomain
610631
itk_add_test(
611632
NAME itkWaveletCoeffsSpatialDomainImageFilterTest
@@ -622,6 +643,10 @@ itk_add_test(
622643
Simoncelli
623644
3
624645
)
646+
itk_add_file_test_cleanup(
647+
itkWaveletCoeffsSpatialDomainImageFilterTest
648+
${ITK_TEST_OUTPUT_DIR}/vol11-16_16_16_SpatialDomain.nrrd
649+
)
625650

626651
## Odd input
627652
# Require ITK_USE_FFTWF

Modules/Filtering/LabelMap/test/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,10 @@ itk_add_test(
372372
0
373373
2
374374
)
375+
itk_add_file_test_cleanup(
376+
itkBinaryImageToLabelMapFilterTest6
377+
${ITK_TEST_OUTPUT_DIR}/LabelImage1Row.bmp
378+
)
375379
itk_add_test(
376380
NAME itkBinaryImageToLabelMapFilterTest7
377381
COMMAND
@@ -383,6 +387,10 @@ itk_add_test(
383387
0
384388
1
385389
)
390+
itk_add_file_test_cleanup(
391+
itkBinaryImageToLabelMapFilterTest7
392+
${ITK_TEST_OUTPUT_DIR}/LabelImage1Row_Test7.bmp
393+
)
386394
itk_add_test(
387395
NAME itkBinaryImageToShapeLabelMapFilterTest1
388396
COMMAND

Modules/IO/DCMTK/test/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ itk_add_test(
166166
0
167167
0
168168
)
169+
itk_add_file_test_cleanup(
170+
itkDCMTKSeriesReadImageWrite
171+
${ITK_TEST_OUTPUT_DIR}/itkDCMTKSeriesReadImageWrite.vtk
172+
)
169173

170174
itk_add_test(
171175
NAME itkDCMTKDirCosinesTest
@@ -178,6 +182,10 @@ itk_add_test(
178182
0
179183
0
180184
)
185+
itk_add_file_test_cleanup(
186+
itkDCMTKDirCosinesTest
187+
${ITK_TEST_OUTPUT_DIR}/itkDCMTKDirCosinesTest.vtk
188+
)
181189

182190
set_property(
183191
TEST

Modules/IO/ImageBase/test/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ itk_add_test(
426426
itkImageFileWriterTest2
427427
${ITK_TEST_OUTPUT_DIR}/test.mha
428428
)
429+
itk_add_file_test_cleanup(itkImageFileWriterTest2_2 ${ITK_TEST_OUTPUT_DIR}/test.mha)
429430
itk_add_test(
430431
NAME itkImageFileWriterTest2_3
431432
COMMAND
@@ -922,6 +923,10 @@ itk_add_test(
922923
itkReadWriteImageWithDictionaryTest
923924
${ITK_TEST_OUTPUT_DIR}/itkReadWriteImageWithDictionaryTest1.mha
924925
)
926+
itk_add_file_test_cleanup(
927+
itkReadWriteImageWithDictionaryTest1
928+
${ITK_TEST_OUTPUT_DIR}/itkReadWriteImageWithDictionaryTest1.mha
929+
)
925930
itk_add_test(
926931
NAME itkVectorImageReadWriteTest
927932
COMMAND

Modules/IO/MeshVTK/test/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ itk_add_test(
6262
${ITK_TEST_OUTPUT_DIR}/fibers_b.vtk
6363
1
6464
)
65+
itk_add_file_test_cleanup(
66+
itkPolyLineReadWriteTest01
67+
${ITK_TEST_OUTPUT_DIR}/fibers_b.vtk
68+
)
6569
itk_add_test(
6670
NAME itkPolyLineReadWriteTest02
6771
COMMAND
@@ -178,6 +182,11 @@ itk_add_test(
178182
1
179183
1
180184
)
185+
itk_add_file_test_cleanup(
186+
itkVTKPolyDataMeshIOTestInOutBinary
187+
${ITK_TEST_OUTPUT_DIR}/fibers_b_VTKPolyDataMeshIO.vtk
188+
${ITK_TEST_OUTPUT_DIR}/binary2binaryvtk2mhaHeadMRVolume.mha
189+
)
181190
itk_add_test(
182191
NAME itkMeshFileReadWriteTestField
183192
COMMAND

Modules/IO/NIFTI/test/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ itk_add_test(
9191
itkNiftiImageIOTest
9292
DATA{${ITK_DATA_ROOT}/Input/LittleEndianCompressed.hdr,LittleEndianCompressed.img.gz}
9393
)
94+
itk_add_file_test_cleanup(
95+
itkNiftiIOLittleEndianCompressed
96+
${ITK_TEST_OUTPUT_DIR}/itkNiftiIOLittleEndianCompressedTest.nii.gz
97+
)
9498
itk_add_test(
9599
NAME itkNiftiIOLittleEndian
96100
COMMAND
@@ -100,6 +104,10 @@ itk_add_test(
100104
itkNiftiIOLittleEndian
101105
DATA{${ITK_DATA_ROOT}/Input/LittleEndian.hdr,LittleEndian.mhd,LittleEndian.img}
102106
)
107+
itk_add_file_test_cleanup(
108+
itkNiftiIOLittleEndian
109+
${ITK_TEST_OUTPUT_DIR}/itkNiftiIOLittleEndianTest.nii.gz
110+
)
103111
itk_add_test(
104112
NAME itkNiftiIOInternalTests
105113
COMMAND

Modules/Numerics/FEM/test/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@ itk_add_test(
358358
DATA{Input/2DC0LinearQuadrilateralStrainTest.meta}
359359
${ITK_TEST_OUTPUT_DIR}/2DC0LinearQuadrilateralStrainTestWrite.meta
360360
)
361+
itk_add_file_test_cleanup(
362+
itkFEMElement2DC0LinearQuadrilateralStrainTest
363+
${ITK_TEST_OUTPUT_DIR}/2DC0LinearQuadrilateralStrainTestWrite.meta
364+
)
361365

362366
itk_add_test(
363367
NAME itkFEMElement2DC0LinearQuadrilateralStressTest
@@ -465,6 +469,10 @@ itk_add_test(
465469
DATA{Input/2DC0LinearQuadrilateralStrainTest.meta}
466470
${ITK_TEST_OUTPUT_DIR}/2DC0LinearQuadrilateralStrainItpackTestWrite.meta
467471
)
472+
itk_add_file_test_cleanup(
473+
itkFEMElement2DC0LinearQuadrilateralStrainItpackTest
474+
${ITK_TEST_OUTPUT_DIR}/2DC0LinearQuadrilateralStrainItpackTestWrite.meta
475+
)
468476

469477
itk_add_test(
470478
NAME itkFEMElement2DC1BeamTest

Modules/Numerics/Statistics/test/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,10 @@ itk_add_test(
923923
DATA{${ITK_DATA_ROOT}/Input/VisibleWomanEyeSlice.png}
924924
${ITK_TEST_OUTPUT_DIR}/itkImageToHistogramFilterTest2.txt
925925
)
926+
itk_add_file_test_cleanup(
927+
itkImageToHistogramFilterTest2
928+
${ITK_TEST_OUTPUT_DIR}/itkImageToHistogramFilterTest2.txt
929+
)
926930
itk_add_test(
927931
NAME itkImageToHistogramFilterTest2_Auto
928932
COMMAND
@@ -932,6 +936,10 @@ itk_add_test(
932936
${ITK_TEST_OUTPUT_DIR}/itkImageToHistogramFilterTest2_Auto.txt
933937
1
934938
)
939+
itk_add_file_test_cleanup(
940+
itkImageToHistogramFilterTest2_Auto
941+
${ITK_TEST_OUTPUT_DIR}/itkImageToHistogramFilterTest2_Auto.txt
942+
)
935943
itk_add_test(
936944
NAME itkScalarImageToHistogramGeneratorTest
937945
COMMAND

Modules/Registration/Common/test/RegistrationITKv3/test/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ itk_add_test(
4949
10000
5050
1
5151
)
52+
itk_add_file_test_cleanup(
53+
ITKv3ImageRegistration4Test
54+
${TEMP}/ImageRegistration4Test.png
55+
${TEMP}/ImageRegistration4BeforeTest.png
56+
${TEMP}/ImageRegistration4AfterTest.png
57+
)
5258

5359
itk_add_test(
5460
NAME ITKv3ImageRegistration4Test2
@@ -68,6 +74,12 @@ itk_add_test(
6874
10000
6975
0
7076
)
77+
itk_add_file_test_cleanup(
78+
ITKv3ImageRegistration4Test2
79+
${TEMP}/ImageRegistration4Test2.png
80+
${TEMP}/ImageRegistration4BeforeTest2.png
81+
${TEMP}/ImageRegistration4AfterTest2.png
82+
)
7183

7284
itk_add_test(
7385
NAME ITKv3ImageRegistration4Test3

Modules/Registration/GPUPDEDeformable/test/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ if(ITK_USE_GPU)
2222
DATA{Input/LenaMov.png}
2323
${ITK_TEST_OUTPUT_DIR}/gpuDemonsRegistrationTest2D.mha
2424
)
25+
itk_add_file_test_cleanup(itkGPUDemonsRegistrationFilterTestDim2 ${ITK_TEST_OUTPUT_DIR}/gpuDemonsRegistrationTest2D.mha)
2526

2627
itk_add_test(
2728
NAME itkGPUDemonsRegistrationFilterTestDim3
@@ -34,6 +35,7 @@ if(ITK_USE_GPU)
3435
DATA{Input/LenaMov.png}
3536
${ITK_TEST_OUTPUT_DIR}/gpuDemonsRegistrationTest3D.mha
3637
)
38+
itk_add_file_test_cleanup(itkGPUDemonsRegistrationFilterTestDim3 ${ITK_TEST_OUTPUT_DIR}/gpuDemonsRegistrationTest3D.mha)
3739

3840
itk_add_test(
3941
NAME itkGPUDemonsRegistrationFilterTest2

0 commit comments

Comments
 (0)