Skip to content

Commit 8329eca

Browse files
committed
zhash/zhashx: Use selftest-rw for selftest cache
Clangd uses `.cache` directory which conflicts with the directory used by the selftests of zhash and zhashx, which caused the tests to fail unnecessarily. Changed those to use `src/selftest-rw` like other tests.
1 parent 2955e21 commit 8329eca

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/zdir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ zdir_flatten (zdir_t *self)
334334
uint index = 0;
335335
if (self)
336336
index = s_dir_flatten (self, files, index);
337-
337+
338338
//sort flattened list for proper patches computation
339339
zlist_t *sorted = zlist_new ();
340340
for (size_t i = 0; i < self->count; i++)
@@ -343,7 +343,7 @@ zdir_flatten (zdir_t *self)
343343
for (size_t i = 0; i < self->count; i++)
344344
files[i] = (zfile_t *) zlist_pop (sorted);
345345
zlist_destroy (&sorted);
346-
346+
347347
return files;
348348
}
349349

src/zhash.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -884,15 +884,15 @@ zhash_test (bool verbose)
884884
// Test save and load
885885
zhash_comment (hash, "This is a test file");
886886
zhash_comment (hash, "Created by %s", "czmq_selftest");
887-
zhash_save (hash, ".cache");
887+
zhash_save (hash, "src/selftest-rw/zhash-test");
888888
copy = zhash_new ();
889889
assert (copy);
890-
zhash_load (copy, ".cache");
890+
zhash_load (copy, "src/selftest-rw/zhash-test");
891891
item = (char *) zhash_lookup (copy, "LIVEBEEF");
892892
assert (item);
893893
assert (streq (item, "dead beef"));
894894
zhash_destroy (&copy);
895-
zsys_file_delete (".cache");
895+
zsys_file_delete ("src/selftest-rw/zhash-test");
896896

897897
// Delete a item
898898
zhash_delete (hash, "LIVEBEEF");

src/zhashx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,15 +1250,15 @@ zhashx_test (bool verbose)
12501250
// Test save and load
12511251
zhashx_comment (hash, "This is a test file");
12521252
zhashx_comment (hash, "Created by %s", "czmq_selftest");
1253-
zhashx_save (hash, ".cache");
1253+
zhashx_save (hash, "src/selftest-rw/zhashx-test");
12541254
copy = zhashx_new ();
12551255
assert (copy);
1256-
zhashx_load (copy, ".cache");
1256+
zhashx_load (copy, "src/selftest-rw/zhashx-test");
12571257
item = (char *) zhashx_lookup (copy, "LIVEBEEF");
12581258
assert (item);
12591259
assert (streq (item, "dead beef"));
12601260
zhashx_destroy (&copy);
1261-
zsys_file_delete (".cache");
1261+
zsys_file_delete ("src/selftest-rw/zhashx-test");
12621262

12631263
// Delete a item
12641264
zhashx_delete (hash, "LIVEBEEF");

0 commit comments

Comments
 (0)