@@ -171,7 +171,7 @@ OCIO_ADD_TEST(OCIOZArchive, is_config_archivable)
171
171
cfg->clearSearchPaths ();
172
172
173
173
// Lambda function to facilitate adding a new FileTransform to a config.
174
- auto addFTAndTestIsArchivable = [&cfg, &minimal ](const std::string & path, bool isArchivable)
174
+ auto addFTAndTestIsArchivable = [&cfg](const std::string & path, bool isArchivable, bool minimal )
175
175
{
176
176
std::string fullPath = pystring::os::path::join (path, " fake_lut.clf" );
177
177
auto ft = OCIO::FileTransform::Create ();
@@ -194,41 +194,41 @@ OCIO_ADD_TEST(OCIOZArchive, is_config_archivable)
194
194
*/
195
195
196
196
// Valid FileTransform path.
197
- addFTAndTestIsArchivable (" luts" , true );
198
- addFTAndTestIsArchivable (R"( luts/myluts1)" , true );
199
- addFTAndTestIsArchivable (R"( luts\myluts1)" , true );
197
+ addFTAndTestIsArchivable (" luts" , true , false );
198
+ addFTAndTestIsArchivable (R"( luts/myluts1)" , true , false );
199
+ addFTAndTestIsArchivable (R"( luts\myluts1)" , true , false );
200
200
201
201
// Valid Search path starting with "./" or ".\".
202
- addFTAndTestIsArchivable (R"( ./myLuts)" , true );
203
- addFTAndTestIsArchivable (R"( .\myLuts)" , true );
202
+ addFTAndTestIsArchivable (R"( ./myLuts)" , true , false );
203
+ addFTAndTestIsArchivable (R"( .\myLuts)" , true , false );
204
204
205
205
// Valid search path starting with "./" or ".\" and a context variable.
206
- addFTAndTestIsArchivable (R"( ./$SHOT/myluts)" , true );
207
- addFTAndTestIsArchivable (R"( .\$SHOT\myluts)" , true );
208
- addFTAndTestIsArchivable (R"( luts/$SHOT)" , true );
209
- addFTAndTestIsArchivable (R"( luts/$SHOT/luts1)" , true );
210
- addFTAndTestIsArchivable (R"( luts\$SHOT)" , true );
211
- addFTAndTestIsArchivable (R"( luts\$SHOT\luts1)" , true );
206
+ addFTAndTestIsArchivable (R"( ./$SHOT/myluts)" , true , false );
207
+ addFTAndTestIsArchivable (R"( .\$SHOT\myluts)" , true , false );
208
+ addFTAndTestIsArchivable (R"( luts/$SHOT)" , true , false );
209
+ addFTAndTestIsArchivable (R"( luts/$SHOT/luts1)" , true , false );
210
+ addFTAndTestIsArchivable (R"( luts\$SHOT)" , true , false );
211
+ addFTAndTestIsArchivable (R"( luts\$SHOT\luts1)" , true , false );
212
212
213
213
/*
214
214
* Illegal scenarios
215
215
*/
216
216
217
217
// Illegal search path starting with "..".
218
- addFTAndTestIsArchivable (R"( ../luts)" , false );
219
- addFTAndTestIsArchivable (R"( ..\myLuts)" , false );
218
+ addFTAndTestIsArchivable (R"( ../luts)" , false , false );
219
+ addFTAndTestIsArchivable (R"( ..\myLuts)" , false , false );
220
220
221
221
// Illegal search path starting with a context variable.
222
- addFTAndTestIsArchivable (R"( $SHOT)" , false );
222
+ addFTAndTestIsArchivable (R"( $SHOT)" , false , false );
223
223
224
224
// Illegal search path with absolute path.
225
- addFTAndTestIsArchivable (R"( /luts)" , false );
226
- addFTAndTestIsArchivable (R"( /$SHOT)" , false );
225
+ addFTAndTestIsArchivable (R"( /luts)" , false , false );
226
+ addFTAndTestIsArchivable (R"( /$SHOT)" , false , false );
227
227
228
228
#ifdef _WIN32
229
- addFTAndTestIsArchivable (R"( C:\luts)" , false );
230
- addFTAndTestIsArchivable (R"( C:\)" , false );
231
- addFTAndTestIsArchivable (R"( \$SHOT)" , false );
229
+ addFTAndTestIsArchivable (R"( C:\luts)" , false , false );
230
+ addFTAndTestIsArchivable (R"( C:\)" , false , false );
231
+ addFTAndTestIsArchivable (R"( \$SHOT)" , false , false );
232
232
#endif
233
233
}
234
234
}
0 commit comments