From nobody Wed Nov 5 14:28:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534872601275939.0984322420602; Tue, 21 Aug 2018 10:30:01 -0700 (PDT) Received: from localhost ([::1]:55079 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsATg-0002pC-2s for importer@patchew.org; Tue, 21 Aug 2018 13:30:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA4V-0001nD-5p for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsA4R-0006eN-9A for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:58 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:36240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA4I-0006Kf-LJ for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:48 -0400 Received: by mail-wm0-x22d.google.com with SMTP id w24-v6so3506192wmc.1 for ; Tue, 21 Aug 2018 10:03:41 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7H16bliIbFMVKVHUUf8BL3vR63tNeSuCaqfsToZD08E=; b=UBlCa62QycVy3EKunkxxGmvZSjquFCONjIL2pM5jfTV2BtGx8fn0sZ59UtsdzDboCF 2fDWIojf+FXwn0Q391RQ+ZZ0+SCYD7nXPa8i7olUqjA5qywixynzURY2XjWpCdtJlS9R mpAy1xDJOS/sVIqk9ErJSR7UO3a1MtwsmmCiuTMyy7WrzT3zWsAE0ORZzS0D0/7Ijohq hKKlrrD9FN3GS4SRii98UF8WxNs4Tujg1xXweNDXtpJS83lpeEeYPrqKdi30wHl21jEP n3VLWBKnit7CI3vFSmUg3MOxkeXXtU+FISiWBHjTJJenOzW8nicxWFiVCwLQxAO+sXUu 0y9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7H16bliIbFMVKVHUUf8BL3vR63tNeSuCaqfsToZD08E=; b=kOtz1IgmEW8jW82NsvXbq+sjur9/SjDS3wp3msSGZXq7eLD038dtMV2NwLQVoBbADL 5HpEVvORw0d+tDtX2nk51c28IFJtHluVN9UFwFqbzk6wDkfzoPJzYnywdAPWHVR4c4T0 +GecAMEAvh6LnQevzDTeEEgrAZQxZGvxYsOgssmr9uLSpXcK2zRsf0PznpViLDix8Z8u XAGlWE0IrZ91csYkT+ozkuePsY0bLi+vOXcSW+6AcuREBURMdI/Pae0NTzPTF3b3TQFp xzeWhs2StYZ/Y8SNDiD+WQ1bhlxDqQ3r4EprXnbB00RMNxBQhRDX/0bbSEYRJyaAbUVe noTg== X-Gm-Message-State: APzg51A6+XKTENVj6MSbDyQXfVWemmNPqxwE9rwTiv85YSvYpud6/3s6 ijlgPjDk0s0U/c+Y6hitatLdpvOQ X-Google-Smtp-Source: ANB0VdZ+rB3M6fFnIeoD5pmpclmWLezPcpqWXrByFKOsFEstLXaaYdhaArZmUSdov9DEVYZml1YS8g== X-Received: by 2002:a1c:5dd4:: with SMTP id r203-v6mr143045wmb.29.1534871019927; Tue, 21 Aug 2018 10:03:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:05 +0200 Message-Id: <1534870966-9287-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL 33/74] build-sys: remove glib_subprocess check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 From: Marc-Andr=C3=A9 Lureau The check should be unnecessary since commit e7b3af81597db1a6b55f2c15d030d703c6b2c6ac "glib: bump min required glib library version to 2.40". Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20180730153639.26466-1-marcandre.lureau@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 3 --- tests/Makefile.include | 2 +- tests/test-char.c | 4 ---- tests/test-x86-cpuid-compat.c | 6 ------ tests/vhost-user-test.c | 4 ---- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/configure b/configure index af0c149..2ff272d 100755 --- a/configure +++ b/configure @@ -6428,9 +6428,6 @@ if test "$bluez" =3D "yes" ; then echo "CONFIG_BLUEZ=3Dy" >> $config_host_mak echo "BLUEZ_CFLAGS=3D$bluez_cflags" >> $config_host_mak fi -if test "$glib_subprocess" =3D "yes" ; then - echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=3Dy" >> $config_host_mak -fi if test "$gtk" =3D "yes" ; then echo "CONFIG_GTK=3Dm" >> $config_host_mak echo "CONFIG_GTKABI=3D$gtkabi" >> $config_host_mak diff --git a/tests/Makefile.include b/tests/Makefile.include index 29e70f4..f3a761b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -124,7 +124,7 @@ check-unit-y +=3D tests/test-qht-par$(EXESUF) gcov-files-test-qht-par-y =3D util/qht.c check-unit-y +=3D tests/test-bitops$(EXESUF) check-unit-y +=3D tests/test-bitcnt$(EXESUF) -check-unit-$(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) +=3D tests/test-qdev-global= -props$(EXESUF) +check-unit-y +=3D tests/test-qdev-global-props$(EXESUF) check-unit-y +=3D tests/check-qom-interface$(EXESUF) gcov-files-check-qom-interface-y =3D qom/object.c check-unit-y +=3D tests/check-qom-proplist$(EXESUF) diff --git a/tests/test-char.c b/tests/test-char.c index 5905d31..2a2ff32 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -56,7 +56,6 @@ static void fe_event(void *opaque, int event) } } =20 -#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 =20 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_subproce= ss); 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 diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c index 84ce9c7..e75b959 100644 --- a/tests/test-x86-cpuid-compat.c +++ b/tests/test-x86-cpuid-compat.c @@ -35,7 +35,6 @@ static QObject *qom_get(const char *path, const char *pro= p) return ret; } =20 -#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS static bool qom_get_bool(const char *path, const char *prop) { QBool *value =3D qobject_to(QBool, qom_get(path, prop)); @@ -44,7 +43,6 @@ static bool qom_get_bool(const char *path, const char *pr= op) qobject_unref(value); return b; } -#endif =20 typedef struct CpuidTestArgs { const char *cmdline; @@ -168,7 +166,6 @@ static FeatureTestArgs *add_feature_test(const char *na= me, const char *cmdline, return args; } =20 -#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=3Doff\"*"= ); g_test_trap_assert_stdout(""); } -#endif =20 int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); =20 -#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 =20 /* Original level values for CPU models: */ add_cpuid_test("x86/cpuid/phenom/level", diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index ca6251f..716aff7 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -768,7 +768,6 @@ static void wait_for_rings_started(TestServer *s, size_= t count) g_mutex_unlock(&s->data_mutex); } =20 -#if defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) static inline void test_server_connect(TestServer *server) { test_server_create_chr(server, ",reconnect=3D1"); @@ -893,7 +892,6 @@ static void test_flags_mismatch(void) g_free(path); } =20 -#endif =20 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); =20 -#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 =20 ret =3D g_test_run(); =20 --=20 1.8.3.1