summary refs log tree commit diff
diff options
context:
space:
mode:
authorJack Cummings <jack@mudshark.org>2021-08-27 14:37:17 -0700
committerAustin Seipp <aseipp@pobox.com>2021-08-31 16:53:58 -0500
commitdea07960df60dc196c158eb538328784791baef3 (patch)
treecc6719c838a310e9763a55578698a190275049c5
parentde2257e11c3d2e70befaba6ef90a8ef0572e41dc (diff)
downloadnixpkgs-dea07960df60dc196c158eb538328784791baef3.tar
nixpkgs-dea07960df60dc196c158eb538328784791baef3.tar.gz
nixpkgs-dea07960df60dc196c158eb538328784791baef3.tar.bz2
nixpkgs-dea07960df60dc196c158eb538328784791baef3.tar.lz
nixpkgs-dea07960df60dc196c158eb538328784791baef3.tar.xz
nixpkgs-dea07960df60dc196c158eb538328784791baef3.tar.zst
nixpkgs-dea07960df60dc196c158eb538328784791baef3.zip
bluespec: use only 'check-smoke' for now
-rw-r--r--pkgs/development/compilers/bluespec/default.nix32
1 files changed, 4 insertions, 28 deletions
diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix
index 108345ec0d9..7fd69be01f6 100644
--- a/pkgs/development/compilers/bluespec/default.nix
+++ b/pkgs/development/compilers/bluespec/default.nix
@@ -1,8 +1,6 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, fontconfig
 , gmp-static, gperf, libX11, libpoly, perl, flex, bison, pkg-config, itktcl
 , incrtcl, tcl, tk, verilog, xorg, yices, zlib, ghc, asciidoctor, tex # docs
-, dejagnu, gnum4, time, tcsh # check
-, longTests ? false # WIP
 }:
 
 let
@@ -24,6 +22,7 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "doc" ];
 
+  # https://github.com/B-Lang-org/bsc/pull/278
   patches = [ ./libstp_stub_makefile.patch ];
 
   postUnpack = ''
@@ -34,32 +33,18 @@ in stdenv.mkDerivation rec {
   '';
 
   preBuild = ''
-    # XXX: remove
-    set -x
-
     patchShebangs \
       src/Verilog/copy_module.pl \
       src/comp/update-build-version.sh \
       src/comp/update-build-system.sh \
-      src/comp/wrapper.sh \
-
-    # patchShebangs doesn't catch these.
-    substituteInPlace \
-        testsuite/findfailures.csh \
-        --replace '/bin/tcsh' "${tcsh}/bin/tcsh" \
-        --replace '/bin/csh' "${tcsh}/bin/tcsh"
-
-    substituteInPlace \
-        testsuite/test_list.sh \
-        --replace '/bin/tcsh' "${tcsh}/bin/tcsh" \
-        --replace '/bin/csh' "${tcsh}/bin/tcsh"
+      src/comp/wrapper.sh 
 
     substituteInPlace src/comp/Makefile \
       --replace 'BINDDIR' 'BINDIR' \
       --replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils'
 
     # allow running bsc to bootstrap
-    export LD_LIBRARY_PATH=/build/source/inst/lib/SAT
+    export LD_LIBRARY_PATH=$PWD/inst/lib/SAT
   '';
 
   buildInputs = yices.buildInputs ++ [
@@ -80,7 +65,6 @@ in stdenv.mkDerivation rec {
     ghcWithPackages
     perl
     pkg-config
-    tcsh
     tex
   ];
 
@@ -92,15 +76,7 @@ in stdenv.mkDerivation rec {
     "STP_STUB=1"
   ];
 
-  doCheck = true;
-
-  checkInputs = [ dejagnu gnum4 verilog perl time ];
-
-  checkTarget = if longTests then "check-suite" else "check-smoke";
-
-  checkFlags = [
-    "SYSTEMCTEST=0" # no SystemC support yet. Patches welcome!
-  ];
+  checkTarget = "check-smoke";
 
   installPhase = ''
     mkdir -p $out