mirror of https://gitee.com/openkylin/qemu.git
build-sys: remove glib_subprocess check
The check should be unnecessary since commit
e7b3af8159
"glib: bump min required glib
library version to 2.40".
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180730153639.26466-1-marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
1fdd474871
commit
692fbdf9f4
|
@ -6428,9 +6428,6 @@ if test "$bluez" = "yes" ; then
|
|||
echo "CONFIG_BLUEZ=y" >> $config_host_mak
|
||||
echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
|
||||
fi
|
||||
if test "$glib_subprocess" = "yes" ; then
|
||||
echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$gtk" = "yes" ; then
|
||||
echo "CONFIG_GTK=m" >> $config_host_mak
|
||||
echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak
|
||||
|
|
|
@ -124,7 +124,7 @@ check-unit-y += tests/test-qht-par$(EXESUF)
|
|||
gcov-files-test-qht-par-y = util/qht.c
|
||||
check-unit-y += tests/test-bitops$(EXESUF)
|
||||
check-unit-y += tests/test-bitcnt$(EXESUF)
|
||||
check-unit-$(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) += tests/test-qdev-global-props$(EXESUF)
|
||||
check-unit-y += tests/test-qdev-global-props$(EXESUF)
|
||||
check-unit-y += tests/check-qom-interface$(EXESUF)
|
||||
gcov-files-check-qom-interface-y = qom/object.c
|
||||
check-unit-y += tests/check-qom-proplist$(EXESUF)
|
||||
|
|
|
@ -56,7 +56,6 @@ static void fe_event(void *opaque, int event)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
|
||||
#ifdef _WIN32
|
||||
static void char_console_test_subprocess(void)
|
||||
{
|
||||
|
@ -106,7 +105,6 @@ static void char_stdio_test(void)
|
|||
g_test_trap_assert_passed();
|
||||
g_test_trap_assert_stdout("buf");
|
||||
}
|
||||
#endif
|
||||
|
||||
static void char_ringbuf_test(void)
|
||||
{
|
||||
|
@ -807,14 +805,12 @@ int main(int argc, char **argv)
|
|||
g_test_add_func("/char/invalid", char_invalid_test);
|
||||
g_test_add_func("/char/ringbuf", char_ringbuf_test);
|
||||
g_test_add_func("/char/mux", char_mux_test);
|
||||
#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
|
||||
#ifdef _WIN32
|
||||
g_test_add_func("/char/console/subprocess", char_console_test_subprocess);
|
||||
g_test_add_func("/char/console", char_console_test);
|
||||
#endif
|
||||
g_test_add_func("/char/stdio/subprocess", char_stdio_test_subprocess);
|
||||
g_test_add_func("/char/stdio", char_stdio_test);
|
||||
#endif
|
||||
#ifndef _WIN32
|
||||
g_test_add_func("/char/pipe", char_pipe_test);
|
||||
#endif
|
||||
|
|
|
@ -35,7 +35,6 @@ static QObject *qom_get(const char *path, const char *prop)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
|
||||
static bool qom_get_bool(const char *path, const char *prop)
|
||||
{
|
||||
QBool *value = qobject_to(QBool, qom_get(path, prop));
|
||||
|
@ -44,7 +43,6 @@ static bool qom_get_bool(const char *path, const char *prop)
|
|||
qobject_unref(value);
|
||||
return b;
|
||||
}
|
||||
#endif
|
||||
|
||||
typedef struct CpuidTestArgs {
|
||||
const char *cmdline;
|
||||
|
@ -168,7 +166,6 @@ static FeatureTestArgs *add_feature_test(const char *name, const char *cmdline,
|
|||
return args;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
|
||||
static void test_plus_minus_subprocess(void)
|
||||
{
|
||||
char *path;
|
||||
|
@ -210,17 +207,14 @@ static void test_plus_minus(void)
|
|||
"Don't mix both \"+cx8\" and \"cx8=off\"*");
|
||||
g_test_trap_assert_stdout("");
|
||||
}
|
||||
#endif
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
|
||||
#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
|
||||
g_test_add_func("/x86/cpuid/parsing-plus-minus/subprocess",
|
||||
test_plus_minus_subprocess);
|
||||
g_test_add_func("/x86/cpuid/parsing-plus-minus", test_plus_minus);
|
||||
#endif
|
||||
|
||||
/* Original level values for CPU models: */
|
||||
add_cpuid_test("x86/cpuid/phenom/level",
|
||||
|
|
|
@ -768,7 +768,6 @@ static void wait_for_rings_started(TestServer *s, size_t count)
|
|||
g_mutex_unlock(&s->data_mutex);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
|
||||
static inline void test_server_connect(TestServer *server)
|
||||
{
|
||||
test_server_create_chr(server, ",reconnect=1");
|
||||
|
@ -893,7 +892,6 @@ static void test_flags_mismatch(void)
|
|||
g_free(path);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static void test_multiqueue(void)
|
||||
{
|
||||
|
@ -975,7 +973,6 @@ int main(int argc, char **argv)
|
|||
qtest_add_func("/vhost-user/migrate", test_migrate);
|
||||
qtest_add_func("/vhost-user/multiqueue", test_multiqueue);
|
||||
|
||||
#if defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
|
||||
/* keeps failing on build-system since Aug 15 2017 */
|
||||
if (getenv("QTEST_VHOST_USER_FIXME")) {
|
||||
qtest_add_func("/vhost-user/reconnect/subprocess",
|
||||
|
@ -988,7 +985,6 @@ int main(int argc, char **argv)
|
|||
test_flags_mismatch_subprocess);
|
||||
qtest_add_func("/vhost-user/flags-mismatch", test_flags_mismatch);
|
||||
}
|
||||
#endif
|
||||
|
||||
ret = g_test_run();
|
||||
|
||||
|
|
Loading…
Reference in New Issue