Github/littlefs
1
Fork 0
Code Actions Activity

Switched from decimal to hexidecimal for test name suffixes

Browse Source 
This compresses a bit better, which is useful since our dbg scripts
truncate into tight prefixes:

- 3 decimals     => 999  = <1000
- 3 hexidecimals => fff  = <4096
- 4 decimals     => 9999 = <10000
This commit is contained in:
Christopher Haster
2024-01-28 03:01:39 -06:00
parent 66a557d19d
commit 5e633aa554
4 changed files with 342 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_alloc.toml
+10 -10
View File
@@ -117,14 +117,14 @@ code = '''
// create this many directories // create this many directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
// check that our mkdir worked // check that our mkdir worked
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -145,7 +145,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -219,7 +219,7 @@ code = '''
// then check that we can read our directories after clobbering // then check that we can read our directories after clobbering
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -238,7 +238,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -274,7 +274,7 @@ code = '''
uint32_t prng = 42; uint32_t prng = 42;
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "file%04d", i); sprintf(name, "file%03x", i);
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
for (lfs_size_t j = 0; j < SIZE; j++) { for (lfs_size_t j = 0; j < SIZE; j++) {
@@ -293,7 +293,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
// check with stat // check with stat
char name[256]; char name[256];
sprintf(name, "file%04d", i); sprintf(name, "file%03x", i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -391,7 +391,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
// check with stat // check with stat
char name[256]; char name[256];
sprintf(name, "file%04d", i); sprintf(name, "file%03x", i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -441,7 +441,7 @@ code = '''
uint32_t prng = 42; uint32_t prng = 42;
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "file%04d", i); sprintf(name, "file%03x", i);
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
for (lfs_size_t j = 0; j < SIZE; j++) { for (lfs_size_t j = 0; j < SIZE; j++) {
@@ -563,7 +563,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
// check with stat // check with stat
char name[256]; char name[256];
sprintf(name, "file%04d", i); sprintf(name, "file%03x", i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
tests/test_dirs.toml
+212 -212
View File
File diff suppressed because it is too large Load Diff
tests/test_dread.toml
+82 -82
View File
@@ -22,7 +22,7 @@ code = '''
// make this many directories // make this many directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -47,7 +47,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
lfsr_dir_tell(&lfs, &dir) => 2 + i; lfsr_dir_tell(&lfs, &dir) => 2 + i;
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -76,7 +76,7 @@ code = '''
// make this many directories // make this many directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -98,7 +98,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
lfsr_dir_tell(&lfs, &dir) => 2 + i; lfsr_dir_tell(&lfs, &dir) => 2 + i;
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -123,7 +123,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
lfsr_dir_tell(&lfs, &dir) => 2 + i; lfsr_dir_tell(&lfs, &dir) => 2 + i;
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -153,7 +153,7 @@ code = '''
// make this many directories // make this many directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -175,7 +175,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
lfsr_dir_tell(&lfs, &dir) => 2 + i; lfsr_dir_tell(&lfs, &dir) => 2 + i;
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -199,7 +199,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
lfsr_dir_seek(&lfs, &dir, 2 + i) => 0; lfsr_dir_seek(&lfs, &dir, 2 + i) => 0;
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -351,7 +351,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -371,7 +371,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -386,7 +386,7 @@ code = '''
if (NEIGHBORS & 0x2) { if (NEIGHBORS & 0x2) {
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "a_IplRNrPH/a_%04d", i); sprintf(name, "a_IplRNrPH/a_%03x", i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
} }
@@ -394,7 +394,7 @@ code = '''
if (NEIGHBORS & 0x1) { if (NEIGHBORS & 0x1) {
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "f_VtoMnwRH/f_%04d", i); sprintf(name, "f_VtoMnwRH/f_%03x", i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
} }
@@ -422,7 +422,7 @@ code = '''
// we should be able to keep reading where we left off // we should be able to keep reading where we left off
for (lfs_size_t i = I; i < N; i++) { for (lfs_size_t i = I; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -467,7 +467,7 @@ code = '''
lfsr_mkdir(&lfs, "a_IplRNrPH") => 0; lfsr_mkdir(&lfs, "a_IplRNrPH") => 0;
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "a_IplRNrPH/a_%04d", i); sprintf(name, "a_IplRNrPH/a_%03x", i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
} }
@@ -477,7 +477,7 @@ code = '''
lfsr_mkdir(&lfs, "f_VtoMnwRH") => 0; lfsr_mkdir(&lfs, "f_VtoMnwRH") => 0;
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "f_VtoMnwRH/f_%04d", i); sprintf(name, "f_VtoMnwRH/f_%03x", i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
} }
@@ -486,7 +486,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -506,7 +506,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -521,7 +521,7 @@ code = '''
if (NEIGHBORS & 0x2) { if (NEIGHBORS & 0x2) {
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "a_IplRNrPH/a_%04d", i); sprintf(name, "a_IplRNrPH/a_%03x", i);
lfsr_remove(&lfs, name) => 0; lfsr_remove(&lfs, name) => 0;
} }
} }
@@ -529,7 +529,7 @@ code = '''
if (NEIGHBORS & 0x1) { if (NEIGHBORS & 0x1) {
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "f_VtoMnwRH/f_%04d", i); sprintf(name, "f_VtoMnwRH/f_%03x", i);
lfsr_remove(&lfs, name) => 0; lfsr_remove(&lfs, name) => 0;
} }
} }
@@ -557,7 +557,7 @@ code = '''
// we should be able to keep reading where we left off // we should be able to keep reading where we left off
for (lfs_size_t i = I; i < N; i++) { for (lfs_size_t i = I; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -602,7 +602,7 @@ code = '''
lfsr_mkdir(&lfs, "a_IplRNrPH") => 0; lfsr_mkdir(&lfs, "a_IplRNrPH") => 0;
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "a_IplRNrPH/a_%04d", i); sprintf(name, "a_IplRNrPH/a_%03x", i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
} }
@@ -612,7 +612,7 @@ code = '''
lfsr_mkdir(&lfs, "f_VtoMnwRH") => 0; lfsr_mkdir(&lfs, "f_VtoMnwRH") => 0;
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "f_VtoMnwRH/f_%04d", i); sprintf(name, "f_VtoMnwRH/f_%03x", i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
} }
@@ -621,7 +621,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -641,7 +641,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -656,9 +656,9 @@ code = '''
if (NEIGHBORS & 0x2) { if (NEIGHBORS & 0x2) {
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "a_IplRNrPH/a_%04d", i); sprintf(name, "a_IplRNrPH/a_%03x", i);
char name_[256]; char name_[256];
sprintf(name_, "a_IplRNrPH/b_%04d", i); sprintf(name_, "a_IplRNrPH/b_%03x", i);
lfsr_rename(&lfs, name, name_) => 0; lfsr_rename(&lfs, name, name_) => 0;
} }
} }
@@ -666,9 +666,9 @@ code = '''
if (NEIGHBORS & 0x1) { if (NEIGHBORS & 0x1) {
for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) {
char name[256]; char name[256];
sprintf(name, "f_VtoMnwRH/f_%04d", i); sprintf(name, "f_VtoMnwRH/f_%03x", i);
char name_[256]; char name_[256];
sprintf(name_, "f_VtoMnwRH/b_%04d", i); sprintf(name_, "f_VtoMnwRH/b_%03x", i);
lfsr_rename(&lfs, name, name_) => 0; lfsr_rename(&lfs, name, name_) => 0;
} }
} }
@@ -696,7 +696,7 @@ code = '''
// we should be able to keep reading where we left off // we should be able to keep reading where we left off
for (lfs_size_t i = I; i < N; i++) { for (lfs_size_t i = I; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -750,7 +750,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i+1); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i+1);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -770,7 +770,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i+1); sprintf(name, "dir%03x", i+1);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -779,7 +779,7 @@ code = '''
// make a dir at J // make a dir at J
char name[256]; char name[256];
sprintf(name, "%s/dir%04d_", ((PARENT) ? "pricklypear" : ""), (int)J); sprintf(name, "%s/dir%03x_", ((PARENT) ? "pricklypear" : ""), (int)J);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
// seek after mkdir? this tests that the internal position is // seek after mkdir? this tests that the internal position is
@@ -796,7 +796,7 @@ code = '''
// we should be able to keep reading, though we may pick up J // we should be able to keep reading, though we may pick up J
for (lfs_size_t i = I + ((I >= J) ? 1 : 0); i < N+1; i++) { for (lfs_size_t i = I + ((I >= J) ? 1 : 0); i < N+1; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d%s", sprintf(name, "dir%03x%s",
i+1 - ((i >= J) ? 1 : 0), i+1 - ((i >= J) ? 1 : 0),
(i == J) ? "_" : ""); (i == J) ? "_" : "");
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
@@ -851,7 +851,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -871,7 +871,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -880,7 +880,7 @@ code = '''
// remove the dir at J // remove the dir at J
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)J);
lfsr_remove(&lfs, name) => 0; lfsr_remove(&lfs, name) => 0;
// seek after remove? this tests that the internal position is // seek after remove? this tests that the internal position is
@@ -901,7 +901,7 @@ code = '''
} }
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -962,7 +962,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -982,7 +982,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -991,9 +991,9 @@ code = '''
// rename the dir at J // rename the dir at J
char old_name[256]; char old_name[256];
sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); sprintf(old_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)J);
char new_name[256]; char new_name[256];
sprintf(new_name, "%s/%smved%04d", sprintf(new_name, "%s/%smved%03x",
((PARENT == 1) ? "pricklypear" ((PARENT == 1) ? "pricklypear"
: (PARENT >= 2) ? "quiabentia" : (PARENT >= 2) ? "quiabentia"
: ""), : ""),
@@ -1019,7 +1019,7 @@ code = '''
} }
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1078,7 +1078,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i+1); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i+1);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -1098,7 +1098,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i+1); sprintf(name, "dir%03x", i+1);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1107,11 +1107,11 @@ code = '''
// make a dir at J // make a dir at J
char name[256]; char name[256];
sprintf(name, "%s/dir%04d_", ((PARENT) ? "pricklypear" : ""), (int)J); sprintf(name, "%s/dir%03x_", ((PARENT) ? "pricklypear" : ""), (int)J);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
// make a dir at K // make a dir at K
sprintf(name, "%s/dir%04d_", ((PARENT) ? "pricklypear" : ""), (int)K); sprintf(name, "%s/dir%03x_", ((PARENT) ? "pricklypear" : ""), (int)K);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
// seek after mkdir? this tests that the internal position is // seek after mkdir? this tests that the internal position is
@@ -1130,7 +1130,7 @@ code = '''
i < N+2; i < N+2;
i++) { i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d%s", sprintf(name, "dir%03x%s",
i+1 - (i >= J + ((J >= K) ? 1 : 0) ? 1 : 0) i+1 - (i >= J + ((J >= K) ? 1 : 0) ? 1 : 0)
- (i >= K + ((K >= J) ? 1 : 0) ? 1 : 0), - (i >= K + ((K >= J) ? 1 : 0) ? 1 : 0),
(i == J + ((J > K) ? 1 : 0) || i == K + ((K > J) ? 1 : 0) (i == J + ((J > K) ? 1 : 0) || i == K + ((K > J) ? 1 : 0)
@@ -1191,7 +1191,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -1211,7 +1211,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1220,11 +1220,11 @@ code = '''
// remove the dir at J // remove the dir at J
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)J);
lfsr_remove(&lfs, name) => 0; lfsr_remove(&lfs, name) => 0;
// remove the dir at K // remove the dir at K
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)K); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)K);
lfsr_remove(&lfs, name) => 0; lfsr_remove(&lfs, name) => 0;
// seek after remove? this tests that the internal position is // seek after remove? this tests that the internal position is
@@ -1245,7 +1245,7 @@ code = '''
} }
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1310,7 +1310,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -1330,7 +1330,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1339,9 +1339,9 @@ code = '''
// rename the dir at J // rename the dir at J
char old_name[256]; char old_name[256];
sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); sprintf(old_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)J);
char new_name[256]; char new_name[256];
sprintf(new_name, "%s/%smved%04d", sprintf(new_name, "%s/%smved%03x",
((PARENT == 1) ? "pricklypear" ((PARENT == 1) ? "pricklypear"
: (PARENT >= 2) ? "quiabentia" : (PARENT >= 2) ? "quiabentia"
: ""), : ""),
@@ -1350,8 +1350,8 @@ code = '''
lfsr_rename(&lfs, old_name, new_name) => 0; lfsr_rename(&lfs, old_name, new_name) => 0;
// rename the dir at K // rename the dir at K
sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)K); sprintf(old_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)K);
sprintf(new_name, "%s/%smved%04d", sprintf(new_name, "%s/%smved%03x",
((PARENT == 1) ? "pricklypear" ((PARENT == 1) ? "pricklypear"
: (PARENT >= 2) ? "quiabentia" : (PARENT >= 2) ? "quiabentia"
: ""), : ""),
@@ -1377,7 +1377,7 @@ code = '''
} }
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1425,7 +1425,7 @@ code = '''
// create our directories // create our directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "pricklypear/dir%04d", i+1); sprintf(name, "pricklypear/dir%03x", i+1);
lfsr_mkdir(&lfs, name) => 0; lfsr_mkdir(&lfs, name) => 0;
} }
@@ -1445,7 +1445,7 @@ code = '''
// read until I // read until I
for (lfs_size_t i = 0; i < I; i++) { for (lfs_size_t i = 0; i < I; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i+1); sprintf(name, "dir%03x", i+1);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1455,7 +1455,7 @@ code = '''
// remove the directory // remove the directory
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "pricklypear/dir%04d", i+1); sprintf(name, "pricklypear/dir%03x", i+1);
lfsr_remove(&lfs, name) => 0; lfsr_remove(&lfs, name) => 0;
} }
lfsr_remove(&lfs, "pricklypear") => 0; lfsr_remove(&lfs, "pricklypear") => 0;
@@ -1515,7 +1515,7 @@ code = '''
// make this many directories // make this many directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
err = lfsr_mkdir(&lfs, name); err = lfsr_mkdir(&lfs, name);
assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST));
} }
@@ -1523,11 +1523,11 @@ code = '''
// check that our mkdir worked // check that our mkdir worked
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
char name2[256]; char name2[256];
sprintf(name2, "dir%04d", i); sprintf(name2, "dir%03x", i);
assert(strcmp(info.name, name2) == 0); assert(strcmp(info.name, name2) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
assert(info.size == 0); assert(info.size == 0);
@@ -1546,7 +1546,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1567,7 +1567,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1594,7 +1594,7 @@ code = '''
// check that our removes worked // check that our removes worked
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT;
} }
@@ -1655,19 +1655,19 @@ code = '''
struct lfs_info info; struct lfs_info info;
err = lfsr_stat(&lfs, err = lfsr_stat(&lfs,
((PARENT == 1) ? ((BEFORE) ((PARENT == 1) ? ((BEFORE)
? "pricklypear/0mved0000" ? "pricklypear/0mved000"
: "pricklypear/mved0000") : "pricklypear/mved000")
: (PARENT >= 2) ? ((BEFORE) : (PARENT >= 2) ? ((BEFORE)
? "quiabentia/0mved0000" ? "quiabentia/0mved000"
: "quiabentia/mved0000") : "quiabentia/mved000")
: ((BEFORE) : ((BEFORE)
? "/0mved0000" ? "/0mved000"
: "/mved0000")), &info); : "/mved000")), &info);
if (err == LFS_ERR_NOENT) { if (err == LFS_ERR_NOENT) {
// make this many directories // make this many directories
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
err = lfsr_mkdir(&lfs, name); err = lfsr_mkdir(&lfs, name);
assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST));
} }
@@ -1675,11 +1675,11 @@ code = '''
// check that our mkdir worked // check that our mkdir worked
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
char name2[256]; char name2[256];
sprintf(name2, "dir%04d", i); sprintf(name2, "dir%03x", i);
assert(strcmp(info.name, name2) == 0); assert(strcmp(info.name, name2) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
assert(info.size == 0); assert(info.size == 0);
@@ -1698,7 +1698,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "dir%04d", i); sprintf(name, "dir%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1762,11 +1762,11 @@ code = '''
// check that our renames worked // check that our renames worked
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT;
sprintf(name, "%s/%smved%04d", sprintf(name, "%s/%smved%03x",
((PARENT == 1) ? "pricklypear" ((PARENT == 1) ? "pricklypear"
: (PARENT >= 2) ? "quiabentia" : (PARENT >= 2) ? "quiabentia"
: ""), : ""),
@@ -1774,7 +1774,7 @@ code = '''
i); i);
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
char name2[256]; char name2[256];
sprintf(name2, "%smved%04d", ((BEFORE) ? "0" : ""), i); sprintf(name2, "%smved%03x", ((BEFORE) ? "0" : ""), i);
assert(strcmp(info.name, name2) == 0); assert(strcmp(info.name, name2) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
assert(info.size == 0); assert(info.size == 0);
@@ -1794,7 +1794,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
tests/test_files.toml
+38 -38
View File
@@ -700,7 +700,7 @@ code = '''
uint32_t prng = 42; uint32_t prng = 42;
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", i); sprintf(name, "amethyst%03x", i);
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
for (lfs_size_t j = 0; j < SIZE; j++) { for (lfs_size_t j = 0; j < SIZE; j++) {
@@ -733,7 +733,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
// check with stat // check with stat
char name[256]; char name[256];
sprintf(name, "amethyst%04d", i); sprintf(name, "amethyst%03x", i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -814,7 +814,7 @@ code = '''
// create a file here // create a file here
char name[256]; char name[256];
sprintf(name, "amethyst%04d", x); sprintf(name, "amethyst%03x", x);
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
for (lfs_size_t j = 0; j < SIZE; j++) { for (lfs_size_t j = 0; j < SIZE; j++) {
wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26); wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26);
@@ -836,7 +836,7 @@ code = '''
// check that our files match our simulation // check that our files match our simulation
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -857,7 +857,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_REG); assert(info.type == LFS_TYPE_REG);
@@ -869,7 +869,7 @@ code = '''
// check the file contents // check the file contents
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
lfsr_file_t file; lfsr_file_t file;
lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0; lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0;
@@ -996,7 +996,7 @@ code = '''
uint32_t prng = 42; uint32_t prng = 42;
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", i); sprintf(name, "amethyst%03x", i);
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
for (lfs_size_t j = 0; j < SIZE; j++) { for (lfs_size_t j = 0; j < SIZE; j++) {
@@ -1029,7 +1029,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
// check with stat // check with stat
char name[256]; char name[256];
sprintf(name, "amethyst%04d", i); sprintf(name, "amethyst%03x", i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -1053,7 +1053,7 @@ code = '''
// now remove some number of files // now remove some number of files
for (lfs_size_t i = 0; i < N-REMAINING; i++) { for (lfs_size_t i = 0; i < N-REMAINING; i++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", i); sprintf(name, "amethyst%03x", i);
lfsr_remove(&lfs, name) => 0; lfsr_remove(&lfs, name) => 0;
// remount? // remount?
@@ -1070,7 +1070,7 @@ code = '''
prng = 42; prng = 42;
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", i); sprintf(name, "amethyst%03x", i);
// keep prng in sync // keep prng in sync
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
@@ -1169,7 +1169,7 @@ code = '''
// create a file here // create a file here
char name[256]; char name[256];
sprintf(name, "amethyst%04d", x); sprintf(name, "amethyst%03x", x);
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
for (lfs_size_t j = 0; j < SIZE; j++) { for (lfs_size_t j = 0; j < SIZE; j++) {
wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26); wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26);
@@ -1195,7 +1195,7 @@ code = '''
// delete this file // delete this file
char name[256]; char name[256];
sprintf(name, "amethyst%04d", x); sprintf(name, "amethyst%03x", x);
lfsr_remove(&lfs, name) => 0; lfsr_remove(&lfs, name) => 0;
} }
} }
@@ -1209,7 +1209,7 @@ code = '''
// check that our files match our simulation // check that our files match our simulation
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -1230,7 +1230,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_REG); assert(info.type == LFS_TYPE_REG);
@@ -1242,7 +1242,7 @@ code = '''
// check the file contents // check the file contents
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
lfsr_file_t file; lfsr_file_t file;
lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0; lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0;
@@ -1286,7 +1286,7 @@ code = '''
// create a number of directories to distance our files // create a number of directories to distance our files
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char path[256]; char path[256];
sprintf(path, "basalt%04d", i); sprintf(path, "basalt%03x", i);
lfsr_mkdir(&lfs, path) => 0; lfsr_mkdir(&lfs, path) => 0;
} }
@@ -1336,7 +1336,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char path[256]; char path[256];
sprintf(path, "basalt%04d", i); sprintf(path, "basalt%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, path) == 0); assert(strcmp(info.name, path) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1385,7 +1385,7 @@ code = '''
// create a number of directories to distance our files // create a number of directories to distance our files
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char path[256]; char path[256];
sprintf(path, "basalt%04d", i); sprintf(path, "basalt%03x", i);
lfsr_mkdir(&lfs, path) => 0; lfsr_mkdir(&lfs, path) => 0;
} }
@@ -1445,7 +1445,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char path[256]; char path[256];
sprintf(path, "basalt%04d", i); sprintf(path, "basalt%03x", i);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, path) == 0); assert(strcmp(info.name, path) == 0);
assert(info.type == LFS_TYPE_DIR); assert(info.type == LFS_TYPE_DIR);
@@ -1942,7 +1942,7 @@ code = '''
uint32_t prng = 42; uint32_t prng = 42;
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", i); sprintf(name, "amethyst%03x", i);
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
for (lfs_size_t j = 0; j < SIZE; j++) { for (lfs_size_t j = 0; j < SIZE; j++) {
@@ -1975,7 +1975,7 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
// check with stat // check with stat
char name[256]; char name[256];
sprintf(name, "amethyst%04d", i); sprintf(name, "amethyst%03x", i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -1999,9 +1999,9 @@ code = '''
// now rename our files // now rename our files
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
char old_name[256]; char old_name[256];
sprintf(old_name, "amethyst%04d", i); sprintf(old_name, "amethyst%03x", i);
char new_name[256]; char new_name[256];
sprintf(new_name, "basalt%04d", i); sprintf(new_name, "basalt%03x", i);
lfsr_rename(&lfs, old_name, new_name) => 0; lfsr_rename(&lfs, old_name, new_name) => 0;
@@ -2017,10 +2017,10 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
// check with stat // check with stat
char name[256]; char name[256];
sprintf(name, "amethyst%04d", i); sprintf(name, "amethyst%03x", i);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT;
sprintf(name, "basalt%04d", i); sprintf(name, "basalt%03x", i);
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_REG); assert(info.type == LFS_TYPE_REG);
@@ -2105,7 +2105,7 @@ code = '''
// create a file here // create a file here
char name[256]; char name[256];
sprintf(name, "amethyst%04d", x); sprintf(name, "amethyst%03x", x);
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
for (lfs_size_t j = 0; j < SIZE; j++) { for (lfs_size_t j = 0; j < SIZE; j++) {
wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26); wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26);
@@ -2166,9 +2166,9 @@ code = '''
// rename this file // rename this file
char old_name[256]; char old_name[256];
sprintf(old_name, "amethyst%04d", x); sprintf(old_name, "amethyst%03x", x);
char new_name[256]; char new_name[256];
sprintf(new_name, "amethyst%04d", y); sprintf(new_name, "amethyst%03x", y);
lfsr_rename(&lfs, old_name, new_name) => 0; lfsr_rename(&lfs, old_name, new_name) => 0;
} }
} }
@@ -2182,7 +2182,7 @@ code = '''
// check that our files match our simulation // check that our files match our simulation
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -2203,7 +2203,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_REG); assert(info.type == LFS_TYPE_REG);
@@ -2215,7 +2215,7 @@ code = '''
// check the file contents // check the file contents
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
lfsr_file_t file; lfsr_file_t file;
lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0; lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0;
@@ -2299,7 +2299,7 @@ code = '''
// create a file here // create a file here
char name[256]; char name[256];
sprintf(name, "amethyst%04d", x); sprintf(name, "amethyst%03x", x);
uint8_t wbuf[SIZE]; uint8_t wbuf[SIZE];
for (lfs_size_t j = 0; j < SIZE; j++) { for (lfs_size_t j = 0; j < SIZE; j++) {
wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26); wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26);
@@ -2325,7 +2325,7 @@ code = '''
// delete this file // delete this file
char name[256]; char name[256];
sprintf(name, "amethyst%04d", x); sprintf(name, "amethyst%03x", x);
lfsr_remove(&lfs, name) => 0; lfsr_remove(&lfs, name) => 0;
// renaming a file? // renaming a file?
@@ -2377,9 +2377,9 @@ code = '''
// rename this file // rename this file
char old_name[256]; char old_name[256];
sprintf(old_name, "amethyst%04d", x); sprintf(old_name, "amethyst%03x", x);
char new_name[256]; char new_name[256];
sprintf(new_name, "amethyst%04d", y); sprintf(new_name, "amethyst%03x", y);
lfsr_rename(&lfs, old_name, new_name) => 0; lfsr_rename(&lfs, old_name, new_name) => 0;
} }
} }
@@ -2393,7 +2393,7 @@ code = '''
// check that our files match our simulation // check that our files match our simulation
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
struct lfs_info info; struct lfs_info info;
lfsr_stat(&lfs, name, &info) => 0; lfsr_stat(&lfs, name, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
@@ -2414,7 +2414,7 @@ code = '''
assert(info.size == 0); assert(info.size == 0);
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
lfsr_dir_read(&lfs, &dir, &info) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0;
assert(strcmp(info.name, name) == 0); assert(strcmp(info.name, name) == 0);
assert(info.type == LFS_TYPE_REG); assert(info.type == LFS_TYPE_REG);
@@ -2426,7 +2426,7 @@ code = '''
// check the file contents // check the file contents
for (lfs_size_t j = 0; j < sim_size; j++) { for (lfs_size_t j = 0; j < sim_size; j++) {
char name[256]; char name[256];
sprintf(name, "amethyst%04d", sim[j]); sprintf(name, "amethyst%03x", sim[j]);
lfsr_file_t file; lfsr_file_t file;
lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0; lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0;