guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] GCJ: run libjava tests.


From: Ricardo Wurmus
Subject: [PATCH] GCJ: run libjava tests.
Date: Thu, 22 Oct 2015 13:07:25 +0200

Hi Guix,

GCJ is likely broken on MIPS and ARM (as can be seen in the way Ant
fails to build on these platforms), but the package builds just fine.
That’s probably because we are not running the libjava tests, which
require dejagnu.

The attached patch adds dejagnu to the native-inputs and replaces the
check phase to build and run the libjava tests.

This patch will likely cause the GCJ package to fail on MIPS and ARM,
but that’s expected and helpful, as it should give us a hint how to make
it work on these platforms.

~~ Ricardo

>From b31be9b6abe66db1620214ad89b8d81342ac2ccd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Thu, 22 Oct 2015 13:02:37 +0200
Subject: [PATCH] gnu: gcj: Run libjava tests.

* gnu/packages/gcc.scm (gcj)[native-inputs]: Add dejagnu.
  [arguments]: Replace check phase to run "check-target-libjava" target.
---
 gnu/packages/gcc.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 7e4f18b..b213be9 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
-;;; Copyright © 2014 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2014, 2015 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2015 Andreas Enge <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -27,6 +27,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages dejagnu)
   #:use-module (gnu packages doxygen)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages docbook)
@@ -460,6 +461,9 @@ using compilers other than GCC."
        ("javac.in" ,javac.in)
        ("ecj-bootstrap" ,ecj-bootstrap)
        ,@(package-inputs gcc)))
+    (native-inputs
+     `(("dejagnu" ,dejagnu)
+       ,@(package-native-inputs gcc)))
     ;; Suppress the separate "lib" output, because otherwise the
     ;; "lib" and "out" outputs would refer to each other, creating
     ;; a cyclic dependency.  <http://debbugs.gnu.org/18101>
@@ -482,6 +486,8 @@ using compilers other than GCC."
                        ,flags))))
        ((#:phases phases)
         `(modify-phases ,phases
+           (replace 'check
+            (lambda _ (zero? (system* "make" "check-target-libjava"))))
            (add-after
             'unpack 'add-lib-output-to-rpath
             (lambda _
-- 
2.1.0


reply via email to

[Prev in Thread] Current Thread [Next in Thread]