From patchwork Sat Jul 27 09:10:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 29553 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A452B27BBEA; Sat, 27 Jul 2024 10:12:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F0DEB27BBE2 for ; Sat, 27 Jul 2024 10:12:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXdT0-0002Yh-Hc; Sat, 27 Jul 2024 05:11:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sXdSz-0002Y9-5d for guix-patches@gnu.org; Sat, 27 Jul 2024 05:11:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sXdSy-000431-TT for guix-patches@gnu.org; Sat, 27 Jul 2024 05:11:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Z4p4jsTc9sCpWAYyukfwOVFy/CFI1x9cQQPu2IaK6Tc=; b=Fgt46C9eqeqNqQkZ4V0QdYgHQKVOXgFgQJ7wBA4T2IuJ7h23V/tOklrSR/Wy+0xjrf7iW7pMhjpJUmk9vs3aanfZ0iqO029treLDKoGvQ48THRU7Tc6L/S5MBSMPLdXEyFphXDeYwgCKafs7rdLXu45mezGRtrXNNAMspdOLPQu4narKWdsx5ZBCuxyXepRkyrjbuYLTxDVPUx29QTGgGkISndDxF7BJSI9pXZyD2V82eVrrzUT/YPkSGhlBKoS65pi0mz9KNmSDqzZGaYkb5/mZgbU1lvUiJ/gO4hgULG3UUEEsN9OBkj43Egk2DIgfgW1AdjM/Q3x/0oWstu0O+w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sXdT8-0002L5-KP for guix-patches@gnu.org; Sat, 27 Jul 2024 05:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72106] [PATCH v4 2/5] gnu: klee: Enable the test suite. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jul 2024 09:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72106@debbugs.gnu.org Cc: liliana.prikler@gmail.com Received: via spool by 72106-submit@debbugs.gnu.org id=B72106.17220715138765 (code B ref 72106); Sat, 27 Jul 2024 09:12:02 +0000 Received: (at 72106) by debbugs.gnu.org; 27 Jul 2024 09:11:53 +0000 Received: from localhost ([127.0.0.1]:40529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSz-0002Gl-3a for submit@debbugs.gnu.org; Sat, 27 Jul 2024 05:11:53 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:37864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSu-0002Bq-Sx; Sat, 27 Jul 2024 05:11:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=Z4p4jsTc 9sCpWAYyukfwOVFy/CFI1x9cQQPu2IaK6Tc=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=tkY3j9WrViEc0KeG2L37xd/tyL3 Ma/TclHapXht3WQ0q2RpKsYY3lhLM4kmbJkEXLNZMcKM635vC1yzk45aiedEUViG0nT35q VnFtV+SFNHPVFrAmnFipsyZ0qNRzFibRmb0jPm3mBWfeId4pR+FWmcLiRWMARBLsZe5Exk U4Cg= Received: from localhost (dynamic-176-005-148-021.176.5.pool.telefonica.de [176.5.148.21]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id c07b19d7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sat, 27 Jul 2024 11:11:33 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sat, 27 Jul 2024 11:10:55 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/check.scm (klee): Enable all tests. [arguments]: Patch lit configuration and set #:test-target. <#:configure-flags?>: Enable system and unit tests, configure gtest. --- gnu/packages/check.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 347bd2e1aa..aeaa2e807f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1063,13 +1063,22 @@ (define-public klee (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6")))) (arguments (list + #:test-target "check" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ + ;; Allow specification of an absolute full path to uclibc. (substitute* "CMakeLists.txt" (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a") - "${KLEE_UCLIBC_PATH}")))) + "${KLEE_UCLIBC_PATH}")) + ;; Make sure that we retain the value of the GUIX_PYTHONPATH + ;; environment variable in the test environmented created by + ;; python-lit. Otherwise, the test scripts won't be able to + ;; find the python-tabulate dependency, causing test failures. + (substitute* "test/lit.cfg" + (("addEnv\\('PWD'\\)" env) + (string-append env "\n" "addEnv('GUIX_PYTHONPATH')"))))) (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1085,7 +1094,13 @@ (define-public klee `("KLEE_RUNTIME_LIBRARY_PATH" = (,(string-append lib "/klee/runtime/")))))))) #:configure-flags - #~(list (string-append "-DLLVMCC=" + #~(list "-DENABLE_UNIT_TESTS=ON" + "-DENABLE_SYSTEM_TESTS=ON" + (string-append "-DGTEST_SRC_DIR=" + #+(package-source googletest)) + (string-append "-DGTEST_INCLUDE_DIR=" + #+(package-source googletest) "/googletest/include") + (string-append "-DLLVMCC=" (search-input-file %build-inputs "/bin/clang")) (string-append "-DLLVMCXX=" (search-input-file %build-inputs "/bin/clang++"))