Attempting to fix tests a bit..
svn path=/nixpkgs/trunk/; revision=28993
This commit is contained in:
parent
30c71f18b8
commit
238625aa76
@ -2,6 +2,7 @@ x@{builderDefsPackage
|
|||||||
, cmake, curl, patch, zlib, icu, sqlite, libuuid
|
, cmake, curl, patch, zlib, icu, sqlite, libuuid
|
||||||
, readline, openssl, spidermonkey_1_8_0rc1
|
, readline, openssl, spidermonkey_1_8_0rc1
|
||||||
, nspr, nss
|
, nspr, nss
|
||||||
|
, unzip, glibcLocales
|
||||||
, runTests ? false
|
, runTests ? false
|
||||||
, ...}:
|
, ...}:
|
||||||
builderDefsPackage
|
builderDefsPackage
|
||||||
@ -20,16 +21,17 @@ rec {
|
|||||||
inherit (s) name;
|
inherit (s) name;
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
|
|
||||||
phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doTest" "doDeploy"];
|
phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "fixPaths" "doMake" "doTest" "doDeploy"];
|
||||||
|
|
||||||
dump0 = (a.doDump "0");
|
dump0 = (a.doDump "0");
|
||||||
|
|
||||||
runTests = a.stdenv.lib.attrByPath ["runTests"] false a;
|
runTests = a.stdenv.lib.attrByPath ["runTests"] false a;
|
||||||
|
|
||||||
doTest = a.fullDepEntry (if runTests then ''
|
doTest = a.fullDepEntry (if runTests then ''
|
||||||
sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
|
|
||||||
mkdir pseudo-home
|
mkdir pseudo-home
|
||||||
export HOME=$PWD/pseudo-home
|
export HOME=$PWD/pseudo-home
|
||||||
|
export LC_ALL=en_US.UTF-8
|
||||||
|
${if a.stdenv.isLinux then "export LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale-archive;" else ""}
|
||||||
make test || true
|
make test || true
|
||||||
'' else "") ["doMake" "minInit"];
|
'' else "") ["doMake" "minInit"];
|
||||||
|
|
||||||
@ -73,6 +75,13 @@ rec {
|
|||||||
cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity*
|
cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity*
|
||||||
'' ["minInit" "addInputs" "doUnpack"];
|
'' ["minInit" "addInputs" "doUnpack"];
|
||||||
|
|
||||||
|
fixPaths = a.fullDepEntry ''
|
||||||
|
sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
|
||||||
|
sed -e 's@/bin/ln@#{a.coreutils}/bin/ln@g' -i ../veracity/src/js_tests/*.js
|
||||||
|
sed -e 's@/usr/bin/gdb@#{a.gdb}/bin/gdb@g' -i ../veracity/testsuite/c_test.sh
|
||||||
|
sed -e 's@"/bin/@"@g' -i ../veracity/testsuite/u*.c
|
||||||
|
'' ["minInit"];
|
||||||
|
|
||||||
doDeploy = a.fullDepEntry ''
|
doDeploy = a.fullDepEntry ''
|
||||||
ensureDir "$out/bin" "$out/share/veracity/"
|
ensureDir "$out/bin" "$out/share/veracity/"
|
||||||
cp -r .. "$out/share/veracity/build-dir"
|
cp -r .. "$out/share/veracity/build-dir"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user