From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 28 Jan 2018 15:12:47 +0000 (+0100)
Subject: Merge branch '3.3-maint'
X-Git-Tag: v3.4~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=992f06b81a103d9e798efd620588322138816395;p=thirdparty%2Fccache.git

Merge branch '3.3-maint'

* 3.3-maint:
  Update NEWS
  test: Verify that UNCACHED_ERR_FD works
  Only write hash debug output if there is any data
  Fix broken UNCACHED_ERR_FD
---

992f06b81a103d9e798efd620588322138816395
diff --cc NEWS.txt
index c43ed4069,f08f2cbef..f6b3fd874
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -1,39 -1,23 +1,56 @@@
  ccache news
  ===========
  
 +ccache 3.4
 +----------
 +Unreleased
 +
 +New features and improvements
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- The compiler option form `--sysroot arg` is now handled like the documented
 +  `--sysroot=arg` form.
 +
 +- Added support for caching `.su` files generated by GCC flag `-fstack-usage`.
 +
 +- Configuration errors are now treated as warnings instead of fatal errors.
 +
 +- ccache should now work with distcc's ``pump'' wrapper.
 +
 +- The optional unifier is no longer disabled when the direct mode is enabled.
 +
 +- Added support for nvcc compiler options `--compiler-bindir/-ccbin`,
 +  `--output-directory/-odir` and `--libdevice-directory/-ldir`.
 +
 +
 +Bug fixes
 +~~~~~~~~~
 +
 +- File size and number counters are now updated correctly when files are
 +  overwritten in the cache, e.g. when using `CCACHE_RECACHE`.
 +
 +- Force run_second_cpp for nvcc.
 +
 +- Fixed how the nvcc options `-optf` and `-odir` are handled.
 +
 +
+ ccache 3.3.6
+ ------------
+ Unreleased
+ 
+ New features and improvements
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ - Improved instructions on how to get cache hits between different working
+   directories.
+ 
+ 
+ Bug fixes
+ ~~~~~~~~~
+ 
+ - Fixed regression in ccache 3.3.5 related to the `UNCACHED_ERR_FD` feature.
+ 
+ 
  ccache 3.3.5
  ------------
  Release date: 2018-01-13
diff --cc test_suites/base.sh
index d49104f8a,000000000..3c836dd15
mode 100644,000000..100644
--- a/test_suites/base.sh
+++ b/test_suites/base.sh
@@@ -1,890 -1,0 +1,922 @@@
 +base_tests() {
 +    # -------------------------------------------------------------------------
 +    TEST "Base case"
 +
 +    $REAL_COMPILER -c -o reference_test1.o test1.c
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +    expect_stat 'files in cache' 1
 +    expect_equal_object_files reference_test1.o test1.o
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +    expect_stat 'files in cache' 1
 +    expect_equal_object_files reference_test1.o test1.o
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Debug option"
 +
 +    $CCACHE_COMPILE -c test1.c -g
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +    expect_stat 'files in cache' 1
 +
 +    $CCACHE_COMPILE -c test1.c -g
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    $REAL_COMPILER -c -o reference_test1.o test1.c -g
 +    expect_equal_object_files reference_test1.o reference_test1.o
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Output option"
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -c test1.c -o foo.o
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    $REAL_COMPILER -c -o reference_test1.o test1.c
 +    expect_equal_object_files reference_test1.o foo.o
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Output option without space"
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -c test1.c -odir
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -c test1.c -optf
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 1
 +
 +    $REAL_COMPILER -c -o reference_test1.o test1.c
 +    expect_equal_object_files reference_test1.o dir
 +    expect_equal_object_files reference_test1.o ptf
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Called for link"
 +
 +    $CCACHE_COMPILE test1.c -o test 2>/dev/null
 +    expect_stat 'called for link' 1
 +
 +    $CCACHE_COMPILE -c test1.c
 +    $CCACHE_COMPILE test1.o -o test 2>/dev/null
 +    expect_stat 'called for link' 2
 +
 +    # -------------------------------------------------------------------------
 +    TEST "No input file"
 +
 +    $CCACHE_COMPILE -c foo.c 2>/dev/null
 +    expect_stat 'no input file' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Called for preprocessing"
 +
 +    $CCACHE_COMPILE -E -c test1.c >/dev/null 2>&1
 +    expect_stat 'called for preprocessing' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Multiple source files"
 +
 +    touch test2.c
 +    $CCACHE_COMPILE -c test1.c test2.c
 +    expect_stat 'multiple source files' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Couldn't find the compiler"
 +
 +    $CCACHE blahblah -c test1.c 2>/dev/null
 +    expect_stat "couldn't find the compiler" 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Bad compiler arguments"
 +
 +    $CCACHE_COMPILE -c test1.c -I 2>/dev/null
 +    expect_stat 'bad compiler arguments' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Unsupported source language"
 +
 +    ln -f test1.c test1.ccc
 +    $CCACHE_COMPILE -c test1.ccc 2>/dev/null
 +    expect_stat 'unsupported source language' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Unsupported compiler option"
 +
 +    $CCACHE_COMPILE -M foo -c test1.c >/dev/null 2>&1
 +    expect_stat 'unsupported compiler option' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Compiler produced stdout"
 +
 +    $CCACHE echo foo -c test1.c >/dev/null
 +    expect_stat 'compiler produced stdout' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Output to a non-regular file"
 +
 +    mkdir testd
 +    $CCACHE_COMPILE -o testd -c test1.c >/dev/null 2>&1
 +    rmdir testd >/dev/null 2>&1
 +    expect_stat 'output to a non-regular file' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "No input file"
 +
 +    $CCACHE_COMPILE -c -O2 2>/dev/null
 +    expect_stat 'no input file' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_DISABLE"
 +
 +    CCACHE_DISABLE=1 $CCACHE_COMPILE -c test1.c 2>/dev/null
 +    if [ -d $CCACHE_DIR ]; then
 +        test_failed "$CCACHE_DIR created despite CCACHE_DISABLE being set"
 +    fi
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_COMMENTS"
 +
 +    $REAL_COMPILER -c -o reference_test1.o test1.c
 +
 +    mv test1.c test1-saved.c
 +    echo '// initial comment' >test1.c
 +    cat test1-saved.c >>test1.c
 +    CCACHE_COMMENTS=1 $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +    echo '// different comment' >test1.c
 +    cat test1-saved.c >>test1.c
 +    CCACHE_COMMENTS=1 $CCACHE_COMPILE -c test1.c
 +    mv test1-saved.c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 2
 +
 +    $REAL_COMPILER -c -o reference_test1.o test1.c
 +    expect_equal_object_files reference_test1.o test1.o
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_NOSTATS"
 +
 +    CCACHE_NOSTATS=1 $CCACHE_COMPILE -c test1.c -O -O
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 0
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_RECACHE"
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    CCACHE_RECACHE=1 $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 2
 +
 +    $REAL_COMPILER -c -o reference_test1.o test1.c
 +    expect_equal_object_files reference_test1.o test1.o
 +
 +    expect_stat 'files in cache' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Directory is hashed if using -g"
 +
 +    mkdir dir1 dir2
 +    cp test1.c dir1
 +    cp test1.c dir2
 +
 +    cd dir1
 +    $CCACHE_COMPILE -c test1.c -g
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +    $CCACHE_COMPILE -c test1.c -g
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    cd ../dir2
 +    $CCACHE_COMPILE -c test1.c -g
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 2
 +    $CCACHE_COMPILE -c test1.c -g
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 2
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Directory is not hashed if not using -g"
 +
 +    mkdir dir1 dir2
 +    cp test1.c dir1
 +    cp test1.c dir2
 +
 +    cd dir1
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    cd ../dir2
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_NOHASHDIR"
 +
 +    mkdir dir1 dir2
 +    cp test1.c dir1
 +    cp test1.c dir2
 +
 +    cd dir1
 +    CCACHE_NOHASHDIR=1 $CCACHE_COMPILE -c test1.c -g
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +    CCACHE_NOHASHDIR=1 $CCACHE_COMPILE -c test1.c -g
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    cd ../dir2
 +    CCACHE_NOHASHDIR=1 $CCACHE_COMPILE -c test1.c -g
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_UNIFY"
 +
 +    echo '// a silly comment' >>test1.c
 +    CCACHE_UNIFY=1 $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    echo '// another silly comment' >>test1.c
 +    CCACHE_UNIFY=1 $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    $REAL_COMPILER -c -o reference_test1.o test1.c
 +    expect_equal_object_files reference_test1.o test1.o
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_NLEVELS"
 +
 +    CCACHE_NLEVELS=4 $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +    expect_stat 'files in cache' 1
 +
 +    CCACHE_NLEVELS=4 $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +    expect_stat 'files in cache' 1
 +
 +    # Directories in $CCACHE_DIR:
 +    # - .
 +    # - tmp
 +    # - a
 +    # - a/b
 +    # - a/b/c
 +    # - a/b/c/d
 +    actual_dirs=$(find $CCACHE_DIR -type d | wc -l)
 +    expected_dirs=6
 +    if [ $actual_dirs -ne $expected_dirs ]; then
 +        test_failed "Expected $expected_dirs directories, found $actual_dirs"
 +    fi
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_EXTRAFILES"
 +
 +    echo a >a
 +    echo b >b
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    CCACHE_EXTRAFILES="a${PATH_DELIM}b" $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 2
 +
 +    CCACHE_EXTRAFILES="a${PATH_DELIM}b" $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 2
 +
 +    echo b2 >b
 +
 +    CCACHE_EXTRAFILES="a${PATH_DELIM}b" $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 3
 +
 +    CCACHE_EXTRAFILES="a${PATH_DELIM}b" $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 3
 +    expect_stat 'cache miss' 3
 +
 +    CCACHE_EXTRAFILES="doesntexist" $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 3
 +    expect_stat 'cache miss' 3
 +    expect_stat 'error hashing extra file' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_PREFIX"
 +
 +    cat <<'EOF' >prefix-a
 +#!/bin/sh
 +echo a >>prefix.result
 +exec "$@"
 +EOF
 +    cat <<'EOF' >prefix-b
 +#!/bin/sh
 +echo b >>prefix.result
 +exec "$@"
 +EOF
 +    chmod +x prefix-a prefix-b
 +    cat <<'EOF' >file.c
 +int foo;
 +EOF
 +    PATH=.:$PATH CCACHE_PREFIX="prefix-a prefix-b" $CCACHE_COMPILE -c file.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +    expect_file_content prefix.result "a
 +b"
 +
 +    PATH=.:$PATH CCACHE_PREFIX="prefix-a prefix-b" $CCACHE_COMPILE -c file.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +    expect_file_content prefix.result "a
 +b"
 +
 +    rm -f prefix.result
 +    PATH=.:$PATH CCACHE_PREFIX_CPP="prefix-a prefix-b" $CCACHE_COMPILE -c file.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 1
 +    expect_file_content prefix.result "a
 +b"
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Files in cache"
 +
 +    for i in $(seq 32); do
 +        generate_code $i test$i.c
 +        $CCACHE_COMPILE -c test$i.c
 +    done
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 32
 +    expect_stat 'files in cache' 32
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Called for preprocessing"
 +
 +    $CCACHE_COMPILE -c test1.c -E >test1.i
 +    expect_stat 'called for preprocessing' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Direct .i compile"
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $REAL_COMPILER -c test1.c -E >test1.i
 +    $CCACHE_COMPILE -c test1.i
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "-x c"
 +
 +    ln -f test1.c test1.ccc
 +
 +    $CCACHE_COMPILE -x c -c test1.ccc
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -x c -c test1.ccc
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "-xc"
 +
 +    ln -f test1.c test1.ccc
 +
 +    $CCACHE_COMPILE -xc -c test1.ccc
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -xc -c test1.ccc
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "-x none"
 +
 +    $CCACHE_COMPILE -x assembler -x none -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -x assembler -x none -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "-x unknown"
 +
 +    $CCACHE_COMPILE -x unknown -c test1.c 2>/dev/null
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 0
 +    expect_stat 'unsupported source language' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "-D not hashed"
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -DNOT_AFFECTING=1 -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "-S"
 +
 +    $CCACHE_COMPILE -S test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -S test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -c test1.s
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 2
 +
 +    $CCACHE_COMPILE -c test1.s
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 2
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_PATH"
 +
 +    override_path=`pwd`/override_path
 +    mkdir $override_path
 +    cat >$override_path/cc <<EOF
 +#!/bin/sh
 +touch override_path_compiler_executed
 +EOF
 +    chmod +x $override_path/cc
 +    CCACHE_PATH=$override_path $CCACHE cc -c test1.c
 +    if [ ! -f override_path_compiler_executed ]; then
 +        test_failed "CCACHE_PATH had no effect"
 +    fi
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_COMPILERCHECK=mtime"
 +
 +    cat >compiler.sh <<EOF
 +#!/bin/sh
 +export CCACHE_DISABLE=1 # If $COMPILER happens to be a ccache symlink...
 +exec $COMPILER "\$@"
 +# A comment
 +EOF
 +    chmod +x compiler.sh
 +    backdate compiler.sh
 +    CCACHE_COMPILERCHECK=mtime $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    sed_in_place 's/comment/yoghurt/' compiler.sh # Don't change the size
 +    chmod +x compiler.sh
 +    backdate compiler.sh # Don't change the timestamp
 +
 +    CCACHE_COMPILERCHECK=mtime $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    touch compiler.sh
 +    CCACHE_COMPILERCHECK=mtime $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 2
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_COMPILERCHECK=content"
 +
 +    cat >compiler.sh <<EOF
 +#!/bin/sh
 +export CCACHE_DISABLE=1 # If $COMPILER happens to be a ccache symlink...
 +exec $COMPILER "\$@"
 +EOF
 +    chmod +x compiler.sh
 +
 +    CCACHE_COMPILERCHECK=content $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    CCACHE_COMPILERCHECK=content $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +    echo "# Compiler upgrade" >>compiler.sh
 +
 +    CCACHE_COMPILERCHECK=content $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 2
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_COMPILERCHECK=none"
 +
 +    cat >compiler.sh <<EOF
 +#!/bin/sh
 +export CCACHE_DISABLE=1 # If $COMPILER happens to be a ccache symlink...
 +exec $COMPILER "\$@"
 +EOF
 +    chmod +x compiler.sh
 +
 +    CCACHE_COMPILERCHECK=none $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    CCACHE_COMPILERCHECK=none $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    echo "# Compiler upgrade" >>compiler.sh
 +    CCACHE_COMPILERCHECK=none $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_COMPILERCHECK=string"
 +
 +    cat >compiler.sh <<EOF
 +#!/bin/sh
 +export CCACHE_DISABLE=1 # If $COMPILER happens to be a ccache symlink...
 +exec $COMPILER "\$@"
 +EOF
 +    chmod +x compiler.sh
 +
 +    CCACHE_COMPILERCHECK=string:foo $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    CCACHE_COMPILERCHECK=string:foo $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    CCACHE_COMPILERCHECK=string:bar $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 2
 +
 +    CCACHE_COMPILERCHECK=string:bar $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 2
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_COMPILERCHECK=command"
 +
 +    cat >compiler.sh <<EOF
 +#!/bin/sh
 +export CCACHE_DISABLE=1 # If $COMPILER happens to be a ccache symlink...
 +exec $COMPILER "\$@"
 +EOF
 +    chmod +x compiler.sh
 +
 +    CCACHE_COMPILERCHECK='echo %compiler%' $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    echo "# Compiler upgrade" >>compiler.sh
 +    CCACHE_COMPILERCHECK="echo ./compiler.sh" $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    cat <<EOF >foobar.sh
 +#!/bin/sh
 +echo foo
 +echo bar
 +EOF
 +    chmod +x foobar.sh
 +    CCACHE_COMPILERCHECK='./foobar.sh' $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 2
 +
 +    CCACHE_COMPILERCHECK='echo foo; echo bar' $CCACHE ./compiler.sh -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 2
 +    expect_stat 'cache miss' 2
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_COMPILERCHECK=unknown_command"
 +
 +    cat >compiler.sh <<EOF
 +#!/bin/sh
 +export CCACHE_DISABLE=1 # If $COMPILER happens to be a ccache symlink...
 +exec $COMPILER "\$@"
 +EOF
 +    chmod +x compiler.sh
 +
 +    CCACHE_COMPILERCHECK="unknown_command" $CCACHE ./compiler.sh -c test1.c 2>/dev/null
 +    if [ "$?" -eq 0 ]; then
 +        test_failed "Expected failure running unknown_command to verify compiler but was success"
 +    fi
 +    expect_stat 'compiler check failed' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "CCACHE_RECACHE should remove previous .stderr"
 +
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    num=`find $CCACHE_DIR -name '*.stderr' | wc -l`
 +    if [ $num -ne 0 ]; then
 +        test_failed "$num stderr files found, expected 0 (#1)"
 +    fi
 +
 +    obj_file=`find $CCACHE_DIR -name '*.o'`
 +    stderr_file=`echo $obj_file | sed 's/..$/.stderr/'`
 +    echo "Warning: foo" >$stderr_file
 +    CCACHE_RECACHE=1 $CCACHE_COMPILE -c test1.c
 +    num=`find $CCACHE_DIR -name '*.stderr' | wc -l`
 +    if [ $num -ne 0 ]; then
 +        test_failed "$num stderr files found, expected 0 (#2)"
 +    fi
 +
 +    # -------------------------------------------------------------------------
 +    TEST "No object file"
 +
 +    cat <<'EOF' >test_no_obj.c
 +int test_no_obj;
 +EOF
 +    cat <<'EOF' >prefix-remove.sh
 +#!/bin/sh
 +"$@"
 +[ x$2 = x-fcolor-diagnostics ] && shift
 +[ x$2 = x-fdiagnostics-color ] && shift
 +[ x$2 = x-std=gnu99 ] && shift
 +[ x$3 = x-o ] && rm $4
 +EOF
 +    chmod +x prefix-remove.sh
 +    CCACHE_PREFIX=`pwd`/prefix-remove.sh $CCACHE_COMPILE -c test_no_obj.c
 +    expect_stat 'compiler produced no output' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Empty object file"
 +
 +    cat <<'EOF' >test_empty_obj.c
 +int test_empty_obj;
 +EOF
 +    cat <<'EOF' >prefix-empty.sh
 +#!/bin/sh
 +"$@"
 +[ x$2 = x-fcolor-diagnostics ] && shift
 +[ x$2 = x-fdiagnostics-color ] && shift
 +[ x$2 = x-std=gnu99 ] && shift
 +[ x$3 = x-o ] && cp /dev/null $4
 +EOF
 +    chmod +x prefix-empty.sh
 +    CCACHE_PREFIX=`pwd`/prefix-empty.sh $CCACHE_COMPILE -c test_empty_obj.c
 +    expect_stat 'compiler produced empty output' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Caching stderr"
 +
 +    cat <<EOF >stderr.c
 +int stderr(void)
 +{
 +  // Trigger warning by having no return statement.
 +}
 +EOF
 +    $CCACHE_COMPILE -Wall -W -c stderr.c 2>/dev/null
 +    num=`find $CCACHE_DIR -name '*.stderr' | wc -l`
 +    if [ $num -ne 1 ]; then
 +        test_failed "$num stderr files found, expected 1"
 +    fi
 +    expect_stat 'files in cache' 2
 +
 +    # -------------------------------------------------------------------------
 +    TEST "--zero-stats"
 +
 +    $CCACHE_COMPILE -c test1.c
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +    expect_stat 'files in cache' 1
 +
 +    $CCACHE -z >/dev/null
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 0
 +    expect_stat 'files in cache' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "--clear"
 +
 +    $CCACHE_COMPILE -c test1.c
 +    $CCACHE_COMPILE -c test1.c
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +    expect_stat 'files in cache' 1
 +
 +    $CCACHE -C >/dev/null
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +    expect_stat 'files in cache' 0
 +
 +    # -------------------------------------------------------------------------
 +    TEST "-P"
 +
 +    # Check that -P disables ccache. (-P removes preprocessor information in
 +    # such a way that the object file from compiling the preprocessed file will
 +    # not be equal to the object file produced when compiling without ccache.)
 +
 +    $CCACHE_COMPILE -c -P test1.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 0
 +    expect_stat 'unsupported compiler option' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "-Wp,-P"
 +
 +    # Check that -Wp,-P disables ccache. (-P removes preprocessor information
 +    # in such a way that the object file from compiling the preprocessed file
 +    # will not be equal to the object file produced when compiling without
 +    # ccache.)
 +
 +    $CCACHE_COMPILE -c -Wp,-P test1.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 0
 +    expect_stat 'unsupported compiler option' 1
 +
 +    $CCACHE_COMPILE -c -Wp,-P,-DFOO test1.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 0
 +    expect_stat 'unsupported compiler option' 2
 +
 +    $CCACHE_COMPILE -c -Wp,-DFOO,-P test1.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 0
 +    expect_stat 'unsupported compiler option' 3
 +
 +    # -------------------------------------------------------------------------
 +    TEST "-Wp,-D"
 +
 +    $CCACHE_COMPILE -c -Wp,-DFOO test1.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE_COMPILE -c -DFOO test1.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Buggy GCC 6 cpp"
 +
 +    cat >buggy-cpp <<EOF
 +#!/bin/sh
 +export CCACHE_DISABLE=1 # If $COMPILER happens to be a ccache symlink...
 +if echo "\$*" | grep -- -D >/dev/null; then
 +  $COMPILER "\$@"
 +else
 +  # Mistreat the preprocessor output in the same way as GCC 6 does.
 +  $COMPILER "\$@" |
 +    sed -e '/^# 1 "<command-line>"\$/ a\\
 +# 31 "<command-line>"' \\
 +        -e 's/^# 1 "<command-line>" 2\$/# 32 "<command-line>" 2/'
 +fi
 +exit 0
 +EOF
 +    cat <<'EOF' >file.c
 +int foo;
 +EOF
 +    chmod +x buggy-cpp
 +
 +    $CCACHE ./buggy-cpp -c file.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 1
 +
 +    $CCACHE ./buggy-cpp -DNOT_AFFECTING=1 -c file.c
 +    expect_stat 'cache hit (direct)' 0
 +    expect_stat 'cache hit (preprocessed)' 1
 +    expect_stat 'cache miss' 1
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Symlink to source directory"
 +
 +    mkdir dir
 +    cd dir
 +    mkdir -p d1/d2
 +    echo '#define A "OK"' >d1/h.h
 +    cat <<EOF >d1/d2/c.c
 +#include <stdio.h>
 +#include "../h.h"
 +int main() { printf("%s\n", A); }
 +EOF
 +    echo '#define A "BUG"' >h.h
 +    ln -s d1/d2 d3
 +
 +    CCACHE_BASEDIR=/ $CCACHE_COMPILE -c $PWD/d3/c.c
 +    $REAL_COMPILER c.o -o c
 +    if [ "$(./c)" != OK ]; then
 +        test_failed "Incorrect header file used"
 +    fi
 +
 +    # -------------------------------------------------------------------------
 +    TEST "Symlink to source file"
 +
 +    mkdir dir
 +    cd dir
 +    mkdir d
 +    echo '#define A "BUG"' >d/h.h
 +    cat <<EOF >d/c.c
 +#include <stdio.h>
 +#include "h.h"
 +int main() { printf("%s\n", A); }
 +EOF
 +    echo '#define A "OK"' >h.h
 +    ln -s d/c.c c.c
 +
 +    CCACHE_BASEDIR=/ $CCACHE_COMPILE -c $PWD/c.c
 +    $REAL_COMPILER c.o -o c
 +    if [ "$(./c)" != OK ]; then
 +        test_failed "Incorrect header file used"
 +    fi
 +
 +    # -------------------------------------------------------------------------
 +    TEST ".incbin"
 +
 +    cat <<EOF >incbin.c
 +char x[] = ".incbin";
 +EOF
 +
 +    $CCACHE_COMPILE -c incbin.c
 +    expect_stat 'cache hit (preprocessed)' 0
 +    expect_stat 'cache miss' 0
 +    expect_stat 'unsupported code directive' 1
++
++    # -------------------------------------------------------------------------
++    TEST "UNCACHED_ERR_FD"
++
++    cat >compiler.sh <<'EOF'
++#!/bin/sh
++if [ "$1" = "-E" ]; then
++    echo preprocessed
++    printf ${N}Pu >&$UNCACHED_ERR_FD
++else
++    echo compiled >test1.o
++    printf ${N}Cc >&2
++    printf ${N}Cu >&$UNCACHED_ERR_FD
++fi
++EOF
++    chmod +x compiler.sh
++
++    N=1 $CCACHE ./compiler.sh -c test1.c 2>stderr.txt
++    stderr=$(cat stderr.txt)
++    expect_stat 'cache hit (preprocessed)' 0
++    expect_stat 'cache miss' 1
++    if [ "$stderr" != "1Pu1Cu1Cc" ]; then
++        test_failed "Unexpected stderr: $stderr != 1Pu1Cu1Cc"
++    fi
++
++    N=2 $CCACHE ./compiler.sh -c test1.c 2>stderr.txt
++    stderr=$(cat stderr.txt)
++    expect_stat 'cache hit (preprocessed)' 1
++    expect_stat 'cache miss' 1
++    if [ "$stderr" != "2Pu1Cc" ]; then
++        test_failed "Unexpected stderr: $stderr != 2Pu1Cc"
++    fi
 +}
 +
 +# =============================================================================
 +
 +SUITE_base_SETUP() {
 +    generate_code 1 test1.c
 +}
 +
 +SUITE_base() {
 +    base_tests
 +}