mirror of
https://github.com/littlefs-project/littlefs.git
synced 2025-12-01 12:20:02 +00:00
Renamed internal runner field filter -> if_
This makes it more consistent with the actual test field, at the cost of the symbol collision.
This commit is contained in:
@ -825,7 +825,7 @@ void perm_count(
|
||||
|
||||
state->total += 1;
|
||||
|
||||
if (case_->filter && !case_->filter()) {
|
||||
if (case_->if_ && !case_->if_()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1365,7 +1365,7 @@ void perm_run(
|
||||
bench_step += 1;
|
||||
|
||||
// filter?
|
||||
if (case_->filter && !case_->filter()) {
|
||||
if (case_->if_ && !case_->if_()) {
|
||||
printf("skipped ");
|
||||
perm_printid(suite, case_);
|
||||
printf("\n");
|
||||
|
||||
@ -58,7 +58,7 @@ struct bench_case {
|
||||
const bench_define_t *defines;
|
||||
size_t permutations;
|
||||
|
||||
bool (*filter)(void);
|
||||
bool (*if_)(void);
|
||||
void (*run)(struct lfs_config *cfg);
|
||||
};
|
||||
|
||||
|
||||
@ -854,7 +854,7 @@ void perm_count(
|
||||
|
||||
state->total += 1;
|
||||
|
||||
if (case_->filter && !case_->filter()) {
|
||||
if (case_->if_ && !case_->if_()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1951,7 +1951,7 @@ void perm_run(
|
||||
test_step += 1;
|
||||
|
||||
// filter?
|
||||
if (case_->filter && !case_->filter()) {
|
||||
if (case_->if_ && !case_->if_()) {
|
||||
printf("skipped ");
|
||||
perm_printid(suite, case_, NULL, 0);
|
||||
printf("\n");
|
||||
|
||||
@ -52,7 +52,7 @@ struct test_case {
|
||||
const test_define_t *defines;
|
||||
size_t permutations;
|
||||
|
||||
bool (*filter)(void);
|
||||
bool (*if_)(void);
|
||||
void (*run)(struct lfs_config *cfg);
|
||||
};
|
||||
|
||||
|
||||
@ -390,9 +390,9 @@ def compile(bench_paths, **args):
|
||||
f.writeln('}')
|
||||
f.writeln()
|
||||
|
||||
# create case filter function
|
||||
# create case if function
|
||||
if suite.if_ or case.if_:
|
||||
f.writeln('bool __bench__%s__filter(void) {'
|
||||
f.writeln('bool __bench__%s__if(void) {'
|
||||
% (case.name))
|
||||
for if_ in it.chain(suite.if_, case.if_):
|
||||
f.writeln(4*' '+'if (!(%s)) return false;' % (
|
||||
@ -450,7 +450,7 @@ def compile(bench_paths, **args):
|
||||
'void *data, size_t i);'
|
||||
% (case.name, k, i))
|
||||
if suite.if_ or case.if_:
|
||||
f.writeln('extern bool __bench__%s__filter('
|
||||
f.writeln('extern bool __bench__%s__if('
|
||||
'void);'
|
||||
% (case.name))
|
||||
f.writeln('extern void __bench__%s__run('
|
||||
@ -510,7 +510,7 @@ def compile(bench_paths, **args):
|
||||
f.writeln(12*' '+'.permutations = %d,'
|
||||
% len(case.permutations))
|
||||
if suite.if_ or case.if_:
|
||||
f.writeln(12*' '+'.filter = __bench__%s__filter,'
|
||||
f.writeln(12*' '+'.if_ = __bench__%s__if,'
|
||||
% (case.name))
|
||||
f.writeln(12*' '+'.run = __bench__%s__run,'
|
||||
% (case.name))
|
||||
|
||||
@ -395,9 +395,9 @@ def compile(test_paths, **args):
|
||||
f.writeln('}')
|
||||
f.writeln()
|
||||
|
||||
# create case filter function
|
||||
# create case if function
|
||||
if suite.if_ or case.if_:
|
||||
f.writeln('bool __test__%s__filter(void) {'
|
||||
f.writeln('bool __test__%s__if(void) {'
|
||||
% (case.name))
|
||||
for if_ in it.chain(suite.if_, case.if_):
|
||||
f.writeln(4*' '+'if (!(%s)) return false;' % (
|
||||
@ -455,7 +455,7 @@ def compile(test_paths, **args):
|
||||
'void *data, size_t i);'
|
||||
% (case.name, k, i))
|
||||
if suite.if_ or case.if_:
|
||||
f.writeln('extern bool __test__%s__filter('
|
||||
f.writeln('extern bool __test__%s__if('
|
||||
'void);'
|
||||
% (case.name))
|
||||
f.writeln('extern void __test__%s__run('
|
||||
@ -517,7 +517,7 @@ def compile(test_paths, **args):
|
||||
f.writeln(12*' '+'.permutations = %d,'
|
||||
% len(case.permutations))
|
||||
if suite.if_ or case.if_:
|
||||
f.writeln(12*' '+'.filter = __test__%s__filter,'
|
||||
f.writeln(12*' '+'.if_ = __test__%s__if,'
|
||||
% (case.name))
|
||||
f.writeln(12*' '+'.run = __test__%s__run,'
|
||||
% (case.name))
|
||||
|
||||
Reference in New Issue
Block a user