From 6d757ca19f50f07480c85d06c6082e1a3ca74d5b Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann.dupont@univ-nantes.fr>
Date: Mon, 29 Nov 2021 10:29:53 +0100
Subject: [PATCH] tests

---
 glicid/packages/mpi.scm | 75 +++++++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 25 deletions(-)

diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm
index 3d01eed..34191ce 100644
--- a/glicid/packages/mpi.scm
+++ b/glicid/packages/mpi.scm
@@ -100,35 +100,60 @@
 
 )
 
+(define (transform-package original-package suffix)
+ (package
+  (inherit original-package)
+  (name (string-append (package-name original-package) "-" suffix ))
+ )
+)
+
 (define openmpi-latest gnu:openmpi)
 
-(define-public openmpi-glicid
- (package 
-  (inherit gnu:openmpi)
-  (name (string-append (package-name openmpi-latest) "-glicid" ))
+(define-public openmpi-glicid  package-input-rewriting/spec `(
+                                 ("slurm" . ,slurm-20.02) ;; we need this for glicid
+                                 #:deep? #t
+                                 )
+                               (transform-package openmpi-latest "glicid"))
 
- (inputs `(
-  (package-input-rewriting `(
-                             (,slurm . ,slurm-20.02.6) ;; we need this for glicid
-                            ))         
-                  ,@(package-inputs openmpi-latest)))
- )
-)
+(define-public openmpi-glicid-with-newer-rdma-core  package-input-rewriting/spec `(
+                                 ("rdma-core" . ,rdma-core-latest) ;; defined on glicid
+                                 #:deep? #t
+                                 )
+                               (transform-package openmpi-latest "-with-newer-rdma"))
 
 
-(define-public openmpi-glicid-with-newer-rdma-core
- (package 
-  (inherit openmpi-glicid)
-  (name (string-append (package-name openmpi-glicid) "-with-newer-rdma-core" ))
- 
- (inputs `(
-    (package-input-rewriting `(
-                             (,rdma-core . ,rdma-core-latest) ;; we need this for glicid
-                            ))         
 
-                  ,@(package-inputs openmpi-glicid)))
- )
-)
+
+;(define-public openmpi-glicid (transform-package openmpi "glicid"))
+
+
+;(define-public openmpi-glicid-b
+; (package 
+;  (inherit gnu:openmpi)
+;  (name (string-append (package-name openmpi-latest) "-glicid" ))
+;
+; (inputs `(
+;  (package-input-rewriting `(
+;                             (,slurm . ,slurm-20.02) ;; we need this for glicid
+;                            ))         
+;                  ,@(package-inputs openmpi-latest)))
+; )
+;)
+
+
+;(define-public openmpi-glicid-with-newer-rdma-core
+; (package 
+;  (inherit openmpi-glicid)
+;  (name (string-append (package-name openmpi-glicid) "-with-newer-rdma-core" ))
+; 
+; (inputs `(
+;    (package-input-rewriting `(
+;                             (,rdma-core . ,rdma-core-latest) ;; we need this for glicid
+;                            ))         
+;
+;                  ,@(package-inputs openmpi-glicid)))
+; )
+;)
 
 (define-public openmpi-glicid-with-newer-libfabric
  (package 
@@ -136,7 +161,7 @@
   (name (string-append (package-name openmpi-glicid) "-with-newer-libfabric" ))
  
  (inputs `(
-    (package-input-rewriting `(
+    ,@(package-input-rewriting `(
                              (,libfabric . ,libfabric-latest) ;; we need this for glicid
                             ))         
 
@@ -183,4 +208,4 @@
  )
 )
 
-;openmpi-glicid
+openmpi-glicid