JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ccache: 3.3.4 -> 3.3.5

Browse Source
This commit is contained in:
adisbladis 2018-01-27 18:08:15 +08:00
parent 74ebb70f89
commit 92d790117d
No known key found for this signature in database
GPG Key ID: ED58F95069B004F5
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/ccache/default.nix
View File

@ -2,10 +2,10 @@
let ccache = stdenv.mkDerivation rec {
name = "ccache-${version}";
version = "3.3.4";
version = "3.3.5";
src = fetchurl {
sha256 = "0ks0vk408mdppfbk8v38p46fqx3p30r9a9cwiia43373i7rmpw94";
sha256 = "1iih5d171rq29366c1z90dri2h8173yyc8rm2740wxiqx6k7c18r";
url = "mirror://samba/ccache/${name}.tar.xz";
};

31
pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch
View File

@ -1,9 +1,9 @@
--- ccache-3.3.4.org/test.sh 2017-02-17 21:28:53.000000000 +0000
+++ ccache-3.3.4/test.sh 2017-07-01 18:38:00.523403023 +0100
@@ -2631,23 +2631,23 @@
--- a/test.sh
+++ b/test.sh
@@ -2669,23 +2669,6 @@ SUITE_cleanup() {
$CCACHE -F 0 -M 256K >/dev/null
$CCACHE -c >/dev/null
# floor(0.8 * 4) = 3
CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null
- expect_file_count 3 '*.o' $CCACHE_DIR
- expect_file_count 3 '*.d' $CCACHE_DIR
- expect_file_count 3 '*.stderr' $CCACHE_DIR
@ -21,23 +21,6 @@
- test_failed "File $file not removed when it should"
- fi
- done
+ #expect_file_count 3 '*.o' $CCACHE_DIR
+ #expect_file_count 3 '*.d' $CCACHE_DIR
+ #expect_file_count 3 '*.stderr' $CCACHE_DIR
+ #expect_stat 'files in cache' 9
+ #expect_stat 'cleanups performed' 1
+ #for i in 3 4 5; do
+ # file=$CCACHE_DIR/a/result$i-4017.o
+ # if [ ! -f $file ]; then
+ # test_failed "File $file removed when it shouldn't"
+ # fi
+ #done
+ #for i in 0 1 2 6 7 8 9; do
+ # file=$CCACHE_DIR/a/result$i-4017.o
+ # if [ -f $file ]; then
+ # test_failed "File $file not removed when it should"
+ # fi
+ #done
# -------------------------------------------------------------------------
TEST "Automatic cache cleanup"
TEST "Automatic cache cleanup, limit_multiple 0.9"