Skip to content

Commit

Permalink
jre_minimal: add 2 simple tests
Browse files Browse the repository at this point in the history
  • Loading branch information
raboof committed Apr 28, 2021
1 parent 1fe6ed3 commit b21d1ae
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkgs/development/compilers/openjdk/jre.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, jdk
, lib
, callPackage
, modules ? [ "java.base" ]
}:

Expand Down Expand Up @@ -29,6 +30,10 @@ let

passthru = {
home = "${jre}";
tests = [
(callPackage ./tests/test_jre_minimal.nix {})
(callPackage ./tests/test_jre_minimal_with_logging.nix {})
];
};
};
in jre
16 changes: 16 additions & 0 deletions pkgs/development/compilers/openjdk/jre_minimal_test1.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{ runCommand

This comment has been minimized.

Copy link
@asbachb

asbachb Aug 4, 2021

Contributor

@raboof can you double check if the file is placed correctly?

This comment has been minimized.

Copy link
@raboof

raboof Aug 5, 2021

Author Member

thanks for noticing, it looks like we meant to move it to tests/test_jre_minimal.nix but we ended up copying it instead. This file can be removed, #132742

, callPackage
, jdk
, jre_minimal
}:

let
hello = callPackage tests/hello.nix {
jdk = jdk;
jre = jre_minimal;
};
in
runCommand "test" {} ''
${hello}/bin/hello | grep "Hello, world!"
touch $out
''
47 changes: 47 additions & 0 deletions pkgs/development/compilers/openjdk/tests/hello-logging.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{ jdk
, jre
, pkgs
}:

/* 'Hello world' Java application derivation for use in tests */
let
source = pkgs.writeTextDir "src/Hello.java" ''
import java.util.logging.Logger;
import java.util.logging.Level;
class Hello {
static Logger logger = Logger.getLogger(Hello.class.getName());
public static void main(String[] args) {
logger.log(Level.INFO, "Hello, world!");
}
}
'';
in
pkgs.stdenv.mkDerivation {
pname = "hello";
version = "1.0.0";

src = source;

buildPhase = ''
runHook preBuildPhase
${jdk}/bin/javac src/Hello.java
runHook postBuildPhase
'';
installPhase = ''
runHook preInstallPhase
mkdir -p $out/lib
cp src/Hello.class $out/lib
mkdir -p $out/bin
cat >$out/bin/hello <<EOF;
#!/usr/bin/env sh
${jre}/bin/java -cp $out/lib Hello
EOF
chmod a+x $out/bin/hello
runHook postInstallPhase
'';
}
42 changes: 42 additions & 0 deletions pkgs/development/compilers/openjdk/tests/hello.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{ jdk
, jre
, pkgs
}:

/* 'Hello world' Java application derivation for use in tests */
let
source = pkgs.writeTextDir "src/Hello.java" ''
class Hello {
public static void main(String[] args) {
System.out.println("Hello, world!");
}
}
'';
in
pkgs.stdenv.mkDerivation {
pname = "hello";
version = "1.0.0";

src = source;

buildPhase = ''
runHook preBuildPhase
${jdk}/bin/javac src/Hello.java
runHook postBuildPhase
'';
installPhase = ''
runHook preInstallPhase
mkdir -p $out/lib
cp src/Hello.class $out/lib
mkdir -p $out/bin
cat >$out/bin/hello <<EOF;
#!/usr/bin/env sh
${jre}/bin/java -cp $out/lib Hello
EOF
chmod a+x $out/bin/hello
runHook postInstallPhase
'';
}
16 changes: 16 additions & 0 deletions pkgs/development/compilers/openjdk/tests/test_jre_minimal.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{ runCommand
, callPackage
, jdk
, jre_minimal
}:

let
hello = callPackage ./hello.nix {
jdk = jdk;
jre = jre_minimal;
};
in
runCommand "test" {} ''
${hello}/bin/hello | grep "Hello, world!"
touch $out
''
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ runCommand
, callPackage
, jdk
, jre_minimal
}:

let
hello-logging = callPackage ./hello-logging.nix {
jdk = jdk;
jre = jre_minimal.override {
modules = [
"java.base"
"java.logging"
];
};
};
in
runCommand "test" {} ''
${hello-logging}/bin/hello &>/dev/stdout | grep "Hello, world!"
touch $out
''

0 comments on commit b21d1ae

Please sign in to comment.