Skip to content

Commit cf206e4

Browse files
ananthbananthb
committed
Move GPU LUT files into the tests dir
Instead of creating temporary LUT files for GPU tests, read them from the testdata directory instead. This removes the need to clean them up after each run. Signed-off-by: Ananth Bhaskararaman <[email protected]>
1 parent 59d6a86 commit cf206e4

File tree

12 files changed

+122
-255
lines changed

12 files changed

+122
-255
lines changed

‎tests/cpu/Context_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ OCIO_ADD_TEST(Context, use_searchpaths)
119119
const std::string res1 = searchPath1 + "/Context.cpp";
120120
OCIO_CHECK_ASSERT(strcmp(SanitizePath(resolvedSource.c_str()).c_str(),
121121
SanitizePath(res1.c_str()).c_str()) == 0);
122-
OCIO_CHECK_NO_THROW(resolvedSource = context->resolveFileLocation("GPUHelpers.h"));
123-
const std::string res2 = searchPath2 + "/GPUHelpers.h";
122+
OCIO_CHECK_NO_THROW(resolvedSource = context->resolveFileLocation("GPUUnitTest.h"));
123+
const std::string res2 = searchPath2 + "/GPUUnitTest.h";
124124
OCIO_CHECK_ASSERT(strcmp(SanitizePath(resolvedSource.c_str()).c_str(),
125125
SanitizePath(res2.c_str()).c_str()) == 0);
126126
}
@@ -141,8 +141,8 @@ OCIO_ADD_TEST(Context, use_searchpaths_workingdir)
141141
const std::string res1 = ociodir + "/" + searchPath1 + "/Context.cpp";
142142
OCIO_CHECK_ASSERT(strcmp(SanitizePath(resolvedSource.c_str()).c_str(),
143143
SanitizePath(res1.c_str()).c_str()) == 0);
144-
OCIO_CHECK_NO_THROW(resolvedSource = context->resolveFileLocation("GPUHelpers.h"));
145-
const std::string res2 = ociodir + "/" + searchPath2 + "/GPUHelpers.h";
144+
OCIO_CHECK_NO_THROW(resolvedSource = context->resolveFileLocation("GPUUnitTest.h"));
145+
const std::string res2 = ociodir + "/" + searchPath2 + "/GPUUnitTest.h";
146146
OCIO_CHECK_ASSERT(strcmp(SanitizePath(resolvedSource.c_str()).c_str(),
147147
SanitizePath(res2.c_str()).c_str()) == 0);
148148
}

‎tests/data/files/lut3d_arbitrary.csp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
CSPLUTV100
2+
3D
3+
4+
2
5+
0.0 1.0
6+
0.0 1.0
7+
2
8+
0.0 1.0
9+
0.0 1.0
10+
2
11+
0.0 1.0
12+
0.0 1.0
13+
14+
2 2 2
15+
0.100000 0.100000 0.100000
16+
1.100000 0.100000 0.100000
17+
0.100000 1.100000 0.100000
18+
1.100000 1.100000 0.100000
19+
0.100000 0.100000 1.100000
20+
1.100000 0.100000 1.100000
21+
0.100000 1.100000 1.100000
22+
1.100000 1.100000 1.100000

‎tests/data/files/lut3d_blu-only.csp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
CSPLUTV100
2+
3D
3+
4+
2
5+
0.0 1.0
6+
0.0 1.0
7+
2
8+
0.0 1.0
9+
0.0 1.0
10+
2
11+
0.0 1.0
12+
0.0 1.0
13+
14+
2 2 2
15+
0.0 0.0 0.0
16+
0.0 0.0 0.0
17+
0.0 0.0 0.0
18+
0.0 0.0 0.0
19+
0.0 0.0 1.0
20+
0.0 0.0 1.0
21+
0.0 0.0 1.0
22+
0.0 0.0 1.0

‎tests/data/files/lut3d_grn-only.csp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
CSPLUTV100
2+
3D
3+
4+
2
5+
0.0 1.0
6+
0.0 1.0
7+
2
8+
0.0 1.0
9+
0.0 1.0
10+
2
11+
0.0 1.0
12+
0.0 1.0
13+
14+
2 2 2
15+
0.0 0.0 0.0
16+
0.0 0.0 0.0
17+
0.0 0.0 0.0
18+
0.0 0.0 0.0
19+
0.0 1.0 0.0
20+
0.0 1.0 0.0
21+
0.0 1.0 0.0
22+
0.0 1.0 0.0

‎tests/data/files/lut3d_red-only.csp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
CSPLUTV100
2+
3D
3+
4+
2
5+
0.0 1.0
6+
0.0 1.0
7+
2
8+
0.0 1.0
9+
0.0 1.0
10+
2
11+
0.0 1.0
12+
0.0 1.0
13+
14+
2 2 2
15+
0.0 0.0 0.0
16+
0.0 0.0 0.0
17+
0.0 0.0 0.0
18+
0.0 0.0 0.0
19+
1.0 0.0 0.0
20+
1.0 0.0 0.0
21+
1.0 0.0 0.0
22+
1.0 0.0 0.0

‎tests/gpu/CDLOp_test.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <OpenColorIO/OpenColorIO.h>
1010

1111
#include "GPUUnitTest.h"
12-
#include "GPUHelpers.h"
1312

1413

1514
namespace OCIO = OCIO_NAMESPACE;

‎tests/gpu/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ set(SOURCES
1212
ECOp_test.cpp
1313
FixedFunctionOp_test.cpp
1414
GammaOp_test.cpp
15-
GPUHelpers.cpp
1615
GPUUnitTest.cpp
1716
GradingPrimaryOp_test.cpp
1817
GradingRGBCurveOp_test.cpp

‎tests/gpu/GPUHelpers.cpp‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎tests/gpu/GPUHelpers.h‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎tests/gpu/Lut1DOp_test.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <OpenColorIO/OpenColorIO.h>
1010

1111
#include "GPUUnitTest.h"
12-
#include "GPUHelpers.h"
1312

1413
namespace OCIO = OCIO_NAMESPACE;
1514

0 commit comments

Comments
 (0)