nix: pin nixpkgs, pin clang 4.0, run test suite

README.md

@@ -76,6 +76,10 @@ bootstrapping (see [default.nix](default.nix)). The recommended way to
 build RaptorJIT is with nix, which provides the dependencies
 automatically, but you can build manually if you prefer.
 
+Building with nix will be slow the first time due to downloading
+toolchains and related dependencies. This is all cached for future
+builds.
+
 #### Build with nix
 
 Install nix:
@@ -84,12 +88,18 @@ Install nix:
 $ curl https://nixos.org/nix/install | sh
 ```
 
-Build in batch-mode (option 1):
+Build in batch-mode and run the test suite (option 1a):
 
 ```shell
 $ nix-build    # produces result/bin/raptorjit
 ```
 
+Build in batch-mode without the test suite (option 1b):
+
+```shell
+$ nix-build -A raptorjit
+```
+
 Build interactively (option 2):
 
 ```shell

default.nix

@@ -7,24 +7,24 @@
 #
 # See README.md for usage instructions.
 
-{ pkgs ? (import <nixpkgs> {}) # Use default nix distro (for now...)
+args @ {
+  pkgs ? (import ./pkgs.nix) {}
 , source ? ./.
 , version ? "dev"
 }:
 
-with pkgs;
-with clangStdenv;            # Clang instead of GCC
+let
+  callPackage = (pkgs.lib.callPackageWith { inherit pkgs; inherit source; inherit version; });
+  raptorjit = (callPackage ./raptorjit.nix {});
+  test = name: args: (callPackage ./test.nix { inherit raptorjit; inherit name; inherit args; });
+in
 
-mkDerivation rec {
-  name = "raptorjit-${version}";
-  inherit version;
-  src = lib.cleanSource source;
-  buildInputs = [ luajit ];  # LuaJIT to bootstrap DynASM
-  installPhase = ''
-    mkdir -p $out/bin
-    cp src/luajit $out/bin/raptorjit
-  '';
-
-  enableParallelBuilding = true;  # Do 'make -j'
+# Build RaptorJIT and run mulitple test suites.
+{
+  raptorjit  = raptorjit;
+  test-O3    = test "O3"    "-O3";
+  test-O2    = test "O2"    "-O2";
+  test-O1    = test "O1"    "-O1";
+  test-nojit = test "nojit" "-joff";
 }
 

pkgs.nix

@@ -0,0 +1 @@
+import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/6a0155d2b7cb10aef1c63b654a2b172d78fd89b4.tar.gz)

raptorjit.nix

@@ -0,0 +1,29 @@
+# default.nix - define the build environment for RaptorJIT
+#
+# This file can be used by 'nix-build' or 'nix-shell' to create a
+# pristine build environment with precisely the expected software in
+# $PATH. This makes it possible to build raptorjit in the same way on
+# any machine.
+#
+# See README.md for usage instructions.
+
+{ pkgs ? (import ./pkgs.nix) {}
+, source ? ./.
+, version ? "dev" }:
+
+with pkgs;
+with llvmPackages_4.stdenv;  # Use clang 4.0
+
+mkDerivation rec {
+  name = "raptorjit-${version}";
+  inherit version;
+  src = source;
+  buildInputs = [ luajit ];  # LuaJIT to bootstrap DynASM
+  installPhase = ''
+    mkdir -p $out/bin
+    cp src/luajit $out/bin/raptorjit
+  '';
+
+  enableParallelBuilding = true;  # Do 'make -j'
+}
+

test.nix

@@ -0,0 +1,19 @@
+{ pkgs, raptorjit, source, name, args }:
+
+pkgs.stdenv.mkDerivation {
+  name = "test-${name}";
+  src = source;
+  buildInputs = [ raptorjit ];
+  phases = "unpackPhase buildPhase";
+  buildPhase = ''
+    mkdir $out
+    cd testsuite/test
+    echo "Running testsuite with ${args} and output to $out/log.txt"
+    raptorjit ${args} test.lua 2>&1 > $out/log.txt
+    result=$?
+    echo -n "*** TEST RESULTS (${args}): "
+    tail -1 $out/log.txt
+    exit $result
+  '';
+}
+