| Message ID | 20201019114108.1779369-1-pbonzini@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | do not use colons in test names | expand |
On 10/19/20 1:41 PM, Paolo Bonzini wrote: > Starting with meson 0.56, colons are used to separate the subproject name > from the test name. Use dash or slash depending on what looks nicer. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/fp/meson.build | 4 ++-- > tests/qtest/meson.build | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/fp/meson.build b/tests/fp/meson.build > index 24739ad421..514e345bf5 100644 > --- a/tests/fp/meson.build > +++ b/tests/fp/meson.build > @@ -603,7 +603,7 @@ fptest_rounding_args = ['-r', 'all'] > # FIXME: i32_to_extF80 (broken), i64_to_extF80 (broken) > # extF80_roundToInt (broken) > foreach k, v : softfloat_conv_tests > - test('fp-test:' + k, fptest, > + test('fp-test-' + k, fptest, > args: fptest_args + fptest_rounding_args + v.split(), > suite: ['softfloat', 'softfloat-conv']) > endforeach > @@ -612,7 +612,7 @@ endforeach > # extF80_{mulAdd} (missing) > foreach k, v : softfloat_tests > extF80_broken = ['lt_quiet', 'rem'].contains(k) > - test('fp-test:' + k, fptest, > + test('fp-test-' + k, fptest, > args: fptest_args + fptest_rounding_args + > ['f16_' + k, 'f32_' + k, 'f64_' + k, 'f128_' + k] + > (extF80_broken ? [] : ['extF80_' + k]), > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > index 3987f96086..c2822d9de7 100644 > --- a/tests/qtest/meson.build > +++ b/tests/qtest/meson.build > @@ -250,7 +250,7 @@ foreach dir : target_dirs > } > endif > # FIXME: missing dependency on the emulator binary and qemu-img > - test('qtest-@0@: @1@'.format(target_base, test), > + test('qtest-@0@/@1@'.format(target_base, test), > qtest_executables[test], > depends: [test_deps, qtest_emulator], > env: qtest_env, >
diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 24739ad421..514e345bf5 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -603,7 +603,7 @@ fptest_rounding_args = ['-r', 'all'] # FIXME: i32_to_extF80 (broken), i64_to_extF80 (broken) # extF80_roundToInt (broken) foreach k, v : softfloat_conv_tests - test('fp-test:' + k, fptest, + test('fp-test-' + k, fptest, args: fptest_args + fptest_rounding_args + v.split(), suite: ['softfloat', 'softfloat-conv']) endforeach @@ -612,7 +612,7 @@ endforeach # extF80_{mulAdd} (missing) foreach k, v : softfloat_tests extF80_broken = ['lt_quiet', 'rem'].contains(k) - test('fp-test:' + k, fptest, + test('fp-test-' + k, fptest, args: fptest_args + fptest_rounding_args + ['f16_' + k, 'f32_' + k, 'f64_' + k, 'f128_' + k] + (extF80_broken ? [] : ['extF80_' + k]), diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 3987f96086..c2822d9de7 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -250,7 +250,7 @@ foreach dir : target_dirs } endif # FIXME: missing dependency on the emulator binary and qemu-img - test('qtest-@0@: @1@'.format(target_base, test), + test('qtest-@0@/@1@'.format(target_base, test), qtest_executables[test], depends: [test_deps, qtest_emulator], env: qtest_env,
Starting with meson 0.56, colons are used to separate the subproject name from the test name. Use dash or slash depending on what looks nicer. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- tests/fp/meson.build | 4 ++-- tests/qtest/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)