From patchwork Fri Apr 22 16:30:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 38755 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 C064D27BBEA; Fri, 22 Apr 2022 17:31:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 88CA127BBE9 for ; Fri, 22 Apr 2022 17:31:21 +0100 (BST) Received: from localhost ([::1]:34176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhwBk-0006Lh-O4 for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 12:31:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhwBS-0006Kt-Tj for guix-patches@gnu.org; Fri, 22 Apr 2022 12:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhwBS-0004Hl-KL for guix-patches@gnu.org; Fri, 22 Apr 2022 12:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhwBS-00023p-Bb for guix-patches@gnu.org; Fri, 22 Apr 2022 12:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55067] [PATCH v2] gnu: nomad-optimizer: Disable failing test. References: <20220422162024.91287-1-paul@apatience.com> In-Reply-To: <20220422162024.91287-1-paul@apatience.com> Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Apr 2022 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55067@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 55067-submit@debbugs.gnu.org id=B55067.16506450507901 (code B ref 55067); Fri, 22 Apr 2022 16:31:02 +0000 Received: (at 55067) by debbugs.gnu.org; 22 Apr 2022 16:30:50 +0000 Received: from localhost ([127.0.0.1]:54590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhwBB-00023H-Un for submit@debbugs.gnu.org; Fri, 22 Apr 2022 12:30:50 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:46678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhwBA-000234-Ia for 55067@debbugs.gnu.org; Fri, 22 Apr 2022 12:30:45 -0400 Date: Fri, 22 Apr 2022 16:30:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650645034; bh=ZN3oV872C4UzpdFX1enwZ68BjoLFNWD2RePaYsxsy+c=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=FhgXdXnhZHa4FNShS7OSqKmswYUzYNYXdehCTJu4geSz/IR/VFr10IFzx0q5SF3Vz sg/Y+1opIklTuCorppjxwka8LF200zKXRCSG9/yoJcg0aOSfU30XgK4tw/u0Ox7hef CwISPuYSUlG7VwDSvuAcYgHleBIZnZ/sCocaTCeYs/lXB/nX26aOr/4EnF28xHcG0u dp0yTfL9xT5v0ROfSqiGNOjm/TLgiXX0SmeAtlBDUGRG/1xpMYOy9bNPhQzT3Ww+XP kOT397Z05ytfXLeT9Dr1jKb3ecY6EAtschE9/TKzJABA+3q/wweuOHN1HL0Hrd3Vsl 0IEzz7ed8c9ng== From: "Paul A. Patience" Message-ID: <20220422163021.92454-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (nomad-optimizer)[arguments]: Disable the examples/advanced/library/PSDMads test. --- Just updating the copyright header too. gnu/packages/maths.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.35.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f4778179d6..190b62fca1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -45,7 +45,7 @@ ;;; Copyright © 2021 Gerd Heber ;;; Copyright © 2021 Franck Pérignon ;;; Copyright © 2021 Philip McGrath -;;; Copyright © 2021 Paul A. Patience +;;; Copyright © 2021-2022 Paul A. Patience ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021 Guillaume Le Vaillant @@ -2008,6 +2008,9 @@ (define-public nomad-optimizer (add-after 'fix-sources-for-build 'fix-sources-for-tests (lambda _ (substitute* "examples/CMakeLists.txt" + ;; This test passes only sometimes. + (("^ +add_subdirectory\\(\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/advanced/library/PSDMads\\)\n") + "") ;; examples/basic/batch/example3 is accidentally omitted. (("^(add_subdirectory\\(\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/basic/batch/example)2(\\)\n)" _ prefix suffix) @@ -2052,10 +2055,6 @@ (define-public nomad-optimizer "examples/advanced/library/exampleSuggestAndObserve/cache0.txt") (let ((builddir (string-append (getcwd) "/../build"))) - ;; For some reason, omitting this fix causes the - ;; examples/advanced/library/PSDMads test to fail, even though - ;; it doesn't seem to reference any part of the FixedVariable - ;; test. (let ((dir "examples/advanced/library/FixedVariable")) (substitute* (string-append dir "/fixedVariable.cpp") (("^( +std::string sExe = ).*" _ prefix)