Trying to better use uncreat/zombie/orphan terms in tests
Renamed a bunch of tests: - test_forphans_create_* -> test_forphans_uncreat_* - test_forphans_cleanup_opened -> test_forphans_cleanup_open - test_forphans_cleanup_orphaned -> test_forphans_cleanup_uncreat - test_forphans_orphanzombie_fuzz -> test_forphans_uz_fuzz - test_forphans_orphanzombiedir_fuzz -> test_forphans_uzd_fuzz - test_*_oz_fuzz -> test_*_uz_fuzz - test_*_ozd_fuzz -> test_*_uzd_fuzz - test_traversal_*_orphan_* -> test_traversal_*_uncreat_* - test_traversal_*_orphaned -> test_traversal_*_uncreat - test_attrs_fattr_orphan -> test_attrs_fattr_uncreat And renamed a number of variables and things.
This commit is contained in:
+16
-16
@@ -1237,7 +1237,7 @@ code = '''
|
||||
lfsr_unmount(&lfs) => 0;
|
||||
'''
|
||||
|
||||
[cases.test_grow_incr_spam_oz_fuzz]
|
||||
[cases.test_grow_incr_spam_uz_fuzz]
|
||||
defines.INIT_BLOCK_COUNT = 2
|
||||
defines.N = [1, 2, 4, 8, 16, 32, 64]
|
||||
defines.OPS = 1024
|
||||
@@ -1277,7 +1277,7 @@ code = '''
|
||||
|
||||
typedef struct sim_file {
|
||||
lfs_size_t x;
|
||||
bool orphan;
|
||||
bool uncreat;
|
||||
bool zombie;
|
||||
uint32_t prng;
|
||||
lfsr_file_t file;
|
||||
@@ -1302,17 +1302,17 @@ code = '''
|
||||
lfs_size_t x = TEST_PRNG(&prng_) % N;
|
||||
|
||||
// already exists?
|
||||
bool orphan = true;
|
||||
bool uncreat = true;
|
||||
uint32_t wprng = 0;
|
||||
for (lfs_size_t j = 0; j < sim_size; j++) {
|
||||
if (sim[j] == x) {
|
||||
orphan = false;
|
||||
uncreat = false;
|
||||
wprng = sim_prngs[j];
|
||||
break;
|
||||
}
|
||||
}
|
||||
// choose a random seed if we don't exist
|
||||
if (orphan) {
|
||||
if (uncreat) {
|
||||
wprng = TEST_PRNG(&prng_);
|
||||
}
|
||||
|
||||
@@ -1331,7 +1331,7 @@ code = '''
|
||||
}
|
||||
|
||||
// write some initial data if we don't exist
|
||||
if (orphan) {
|
||||
if (uncreat) {
|
||||
uint8_t wbuf[SIZE];
|
||||
uint32_t wprng_ = wprng;
|
||||
for (lfs_size_t k = 0; k < SIZE; k++) {
|
||||
@@ -1349,7 +1349,7 @@ code = '''
|
||||
|
||||
// open in our sim
|
||||
sim_files[j]->x = x;
|
||||
sim_files[j]->orphan = orphan;
|
||||
sim_files[j]->uncreat = uncreat;
|
||||
sim_files[j]->zombie = false;
|
||||
sim_files[j]->prng = wprng;
|
||||
sim_file_count++;
|
||||
@@ -1412,7 +1412,7 @@ code = '''
|
||||
// update related sim files
|
||||
for (lfs_size_t k = 0; k < sim_file_count; k++) {
|
||||
if (sim_files[k]->x == x && !sim_files[k]->zombie) {
|
||||
sim_files[k]->orphan = false;
|
||||
sim_files[k]->uncreat = false;
|
||||
sim_files[k]->prng = wprng;
|
||||
}
|
||||
}
|
||||
@@ -1661,7 +1661,7 @@ code = '''
|
||||
lfsr_unmount(&lfs) => 0;
|
||||
'''
|
||||
|
||||
[cases.test_grow_incr_spam_ozd_fuzz]
|
||||
[cases.test_grow_incr_spam_uzd_fuzz]
|
||||
defines.INIT_BLOCK_COUNT = 2
|
||||
defines.N = [1, 2, 4, 8, 16, 32, 64]
|
||||
defines.OPS = 1024
|
||||
@@ -1702,7 +1702,7 @@ code = '''
|
||||
|
||||
typedef struct sim_file {
|
||||
lfs_size_t x;
|
||||
bool orphan;
|
||||
bool uncreat;
|
||||
bool zombie;
|
||||
uint32_t prng;
|
||||
lfsr_file_t file;
|
||||
@@ -1727,20 +1727,20 @@ code = '''
|
||||
lfs_size_t x = TEST_PRNG(&prng_) % N;
|
||||
|
||||
// already exists?
|
||||
bool orphan = true;
|
||||
bool uncreat = true;
|
||||
uint32_t wprng = 0;
|
||||
for (lfs_size_t j = 0; j < sim_size; j++) {
|
||||
if (sim[j] == x) {
|
||||
if (sim_isdirs[j]) {
|
||||
goto nonsense;
|
||||
}
|
||||
orphan = false;
|
||||
uncreat = false;
|
||||
wprng = sim_prngs[j];
|
||||
break;
|
||||
}
|
||||
}
|
||||
// choose a random seed if we don't exist
|
||||
if (orphan) {
|
||||
if (uncreat) {
|
||||
wprng = TEST_PRNG(&prng_);
|
||||
}
|
||||
|
||||
@@ -1759,7 +1759,7 @@ code = '''
|
||||
}
|
||||
|
||||
// write some initial data if we don't exist
|
||||
if (orphan) {
|
||||
if (uncreat) {
|
||||
uint8_t wbuf[SIZE];
|
||||
uint32_t wprng_ = wprng;
|
||||
for (lfs_size_t k = 0; k < SIZE; k++) {
|
||||
@@ -1777,7 +1777,7 @@ code = '''
|
||||
|
||||
// open in our sim
|
||||
sim_files[j]->x = x;
|
||||
sim_files[j]->orphan = orphan;
|
||||
sim_files[j]->uncreat = uncreat;
|
||||
sim_files[j]->zombie = false;
|
||||
sim_files[j]->prng = wprng;
|
||||
sim_file_count++;
|
||||
@@ -1843,7 +1843,7 @@ code = '''
|
||||
// update related sim files
|
||||
for (lfs_size_t k = 0; k < sim_file_count; k++) {
|
||||
if (sim_files[k]->x == x && !sim_files[k]->zombie) {
|
||||
sim_files[k]->orphan = false;
|
||||
sim_files[k]->uncreat = false;
|
||||
sim_files[k]->prng = wprng;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user