diff --git a/runners/bench_runner.c b/runners/bench_runner.c index 5c0ee902..3c4ec505 100644 --- a/runners/bench_runner.c +++ b/runners/bench_runner.c @@ -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"); diff --git a/runners/bench_runner.h b/runners/bench_runner.h index 7fb8b9c1..3421066a 100644 --- a/runners/bench_runner.h +++ b/runners/bench_runner.h @@ -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); }; diff --git a/runners/test_runner.c b/runners/test_runner.c index 808b6be0..e8798e63 100644 --- a/runners/test_runner.c +++ b/runners/test_runner.c @@ -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"); diff --git a/runners/test_runner.h b/runners/test_runner.h index a739ffc8..908b525f 100644 --- a/runners/test_runner.h +++ b/runners/test_runner.h @@ -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); }; diff --git a/scripts/bench.py b/scripts/bench.py index a7088eea..a3ed0ec9 100755 --- a/scripts/bench.py +++ b/scripts/bench.py @@ -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)) diff --git a/scripts/test.py b/scripts/test.py index 5982ef17..9ebfe24e 100755 --- a/scripts/test.py +++ b/scripts/test.py @@ -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))