From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] powertab: Enable tests and update. Date: Sat, 04 Jul 2015 11:24:00 +0200 Message-ID: <87pp48jmxb.fsf@elephly.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBJgC-000474-Pi for guix-devel@gnu.org; Sat, 04 Jul 2015 05:24:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBJg7-0002qr-BT for guix-devel@gnu.org; Sat, 04 Jul 2015 05:24:12 -0400 Received: from sender163-mail.zoho.com ([74.201.84.163]:25114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBJg7-0002q2-2M for guix-devel@gnu.org; Sat, 04 Jul 2015 05:24:07 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Guix-devel --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-powertabeditor-Enable-tests.patch Content-Transfer-Encoding: 8bit >From 2d11dfa79d388e409965cda8f05d77b3eafcee86 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jul 2015 11:11:19 +0200 Subject: [PATCH 1/2] gnu: powertabeditor: Enable tests. * gnu/packages/music.scm (powertabeditor)[arguments]: Run "pte_tests" in "check" phase; add phase "fix-tests". --- gnu/packages/music.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8583c89..3beb151 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -323,9 +323,6 @@ your own lessons.") (delete-file-recursively "external") (substitute* "CMakeLists.txt" (("include_directories\\(\\$\\{PROJECT_SOURCE_DIR\\}/external/.*") "") - ;; TODO: tests cannot be built: - ;; test/test_main.cpp:28:12: error: ‘Session’ is not a member of ‘Catch’ - (("add_subdirectory\\(test\\)") "") (("add_subdirectory\\(external\\)") "")) (substitute* "test/CMakeLists.txt" (("include_directories\\(\\$\\{PROJECT_SOURCE_DIR\\}/external/.*") "")) @@ -342,20 +339,34 @@ your own lessons.") #t)))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no "check" target - #:modules ((guix build cmake-build-system) + `(#:modules ((guix build cmake-build-system) (guix build utils) (ice-9 match)) #:configure-flags ;; CMake appears to lose the RUNPATH for some reason, so it has to be ;; explicitly set with CMAKE_INSTALL_RPATH. - (list (string-append "-DCMAKE_INSTALL_RPATH=" + (list "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" + "-DCMAKE_ENABLE_PRECOMPILED_HEADERS=OFF" ; if ON pte_tests cannot be built + (string-append "-DCMAKE_INSTALL_RPATH=" (string-join (map (match-lambda ((name . directory) (string-append directory "/lib"))) %build-inputs) ";"))) #:phases (modify-phases %standard-phases + (replace + 'check + (lambda _ + (zero? (system* "bin/pte_tests" + ;; Exclude this failing test + "~Formats/PowerTabOldImport/Directions")))) + (add-before + 'configure 'fix-tests + (lambda _ + ;; Tests cannot be built with precompiled headers + (substitute* "test/CMakeLists.txt" + (("cotire\\(pte_tests\\)") "")) + #t)) (add-before 'configure 'remove-third-party-libs (lambda* (#:key inputs #:allow-other-keys) @@ -363,7 +374,7 @@ your own lessons.") ;; using the bundled version of withershins. (substitute* '("source/CMakeLists.txt" "test/CMakeLists.txt") - (("target_link_libraries\\((powertabeditor)" _ target) + (("target_link_libraries\\((powertabeditor|pte_tests)" _ target) (string-append "target_link_libraries(" target " " (assoc-ref inputs "binutils") "/lib/libbfd.a " -- 2.4.3 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-powertabeditor-Update-to-2.0.0-alpha8.patch >From 579c4ea1b7ff6c06fb66556da34786e09ecbba7a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jul 2015 11:12:17 +0200 Subject: [PATCH 2/2] gnu: powertabeditor: Update to 2.0.0-alpha8. * gnu/packages/music.scm (powertabeditor): Update to 2.0.0-alpha8. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3beb151..9e7e012 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -306,7 +306,7 @@ your own lessons.") (define-public powertabeditor (package (name "powertabeditor") - (version "2.0.0-alpha7") + (version "2.0.0-alpha8") (source (origin (method url-fetch) (uri (string-append @@ -315,7 +315,7 @@ your own lessons.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1yp6ck2r72c2pfq31z1kpw1j639rndrifj85l3cbj2kdf8rdzhkk")) + "0gaa2x209v3azql8ak3r1n9a9qbxjx2ssirvwdxwklv2lmfqkm82")) (modules '((guix build utils))) (snippet '(begin -- 2.4.3 --=-=-=--