Message ID | 20201023210637.351238-2-hskinnemoen@google.com |
---|---|
State | New |
Headers | show |
Series | Additional NPCM7xx features, devices and tests | expand |
On 23/10/2020 23.06, Havard Skinnemoen wrote: > This test won't work if qemu was compiled without CONFIG_NPCM7XX, as > pointed out by Thomas Huth on a different patch. > > Signed-off-by: Havard Skinnemoen <hskinnemoen@google.com> > --- > tests/qtest/meson.build | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > index 28d4068718..7e0ecaa2c5 100644 > --- a/tests/qtest/meson.build > +++ b/tests/qtest/meson.build > @@ -133,12 +133,13 @@ qtests_sparc64 = \ > (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \ > ['prom-env-test', 'boot-serial-test'] > > +qtests_npcm7xx = ['npcm7xx_timer-test'] > qtests_arm = \ > (config_all_devices.has_key('CONFIG_PFLASH_CFI02') ? ['pflash-cfi02-test'] : []) + \ > + (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \ > ['arm-cpu-features', > 'microbit-test', > 'm25p80-test', > - 'npcm7xx_timer-test', > 'test-arm-mptimer', > 'boot-serial-test', > 'hexloader-test'] > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 28d4068718..7e0ecaa2c5 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -133,12 +133,13 @@ qtests_sparc64 = \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \ ['prom-env-test', 'boot-serial-test'] +qtests_npcm7xx = ['npcm7xx_timer-test'] qtests_arm = \ (config_all_devices.has_key('CONFIG_PFLASH_CFI02') ? ['pflash-cfi02-test'] : []) + \ + (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \ ['arm-cpu-features', 'microbit-test', 'm25p80-test', - 'npcm7xx_timer-test', 'test-arm-mptimer', 'boot-serial-test', 'hexloader-test']
This test won't work if qemu was compiled without CONFIG_NPCM7XX, as pointed out by Thomas Huth on a different patch. Signed-off-by: Havard Skinnemoen <hskinnemoen@google.com> --- tests/qtest/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)