diff options
| author | Joel Rosdahl <joel@rosdahl.net> | 2018-09-26 22:34:50 +0200 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2018-09-26 22:34:50 +0200 |
| commit | f7712082106bef085515f86ae47e7dbbd2a48b57 (patch) | |
| tree | 5a726e74b5028d7d633300e3ae455561885b2970 /test/suites/cpp1.bash | |
| parent | 2d57113eaa407bb92de51a3eb41cdd8cca820e3a (diff) | |
| parent | 554195a802cd4bdcc8d7698b0bbaccbf84f33939 (diff) | |
| download | ccache-dev/memcached.tar.gz | |
Merge branch 'master' into dev/memcacheddev/memcached
* master: (27 commits)
Update NEWS
Improve documentation of file_stat_matches_ctime
Add option to disable ctime check for manifest
test: Fix various Solaris shell issues
Prepare for v3.4.3
Update NEWS
Upgrade zlib to 1.2.11
Update NEWS
Bail out on compiler option -save-temps=obj
Fix minor memory leak introduced in dde3543c
Fix “clang analyze” false positive
Update NEWS
process_preprocessed_file: Move gnu_getcwd() out of tight loop
Make sure to install gperf for analyze
Update NEWS
Add handling of separate -target parameter
Update NEWS
Add a Vagrantfile for testing on FreeBSD
Compiler "cc" might still be the same as "clang"
Add FreeBSD compatibility to test suites
...
Diffstat (limited to 'test/suites/cpp1.bash')
| -rw-r--r-- | test/suites/cpp1.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/suites/cpp1.bash b/test/suites/cpp1.bash index 965d4667..6655778d 100644 --- a/test/suites/cpp1.bash +++ b/test/suites/cpp1.bash @@ -33,7 +33,7 @@ SUITE_cpp1() { elif $COMPILER_TYPE_CLANG; then cpp_flag="-frewrite-includes" fi - cpp_flag+=" -DBAZ=3" + cpp_flag="$cpp_flag -DBAZ=3" # ------------------------------------------------------------------------- TEST "Base case" |