Fix free_all_mem and EXITFREE definition

Because of the '$' in `if(DEFINED $ENV{VALGRIND_CHECK})` EXITFREE wasn't being
defined, so the `free_all_mem` wasn't being included or called in the resulting
binary.

This commit fixes that, and also adds includes needed for `free_all_mem`
compilation.
This commit is contained in:
Thiago de Arruda 2014-03-07 11:58:06 -03:00
parent 0412ee7440
commit 2f1a2eb0f2
4 changed files with 15 additions and 2 deletions

1
.gitignore vendored
View File

@ -22,6 +22,7 @@
/src/testdir/tiny.vim /src/testdir/tiny.vim
/src/testdir/test*.out /src/testdir/test*.out
/src/testdir/test.log /src/testdir/test.log
/src/testdir/viminfo
/src/testdir/test.ok /src/testdir/test.ok
/src/testdir/*.failed /src/testdir/*.failed
/src/testdir/X* /src/testdir/X*

View File

@ -25,7 +25,8 @@ else()
set(DEBUG 0) set(DEBUG 0)
endif() endif()
if(DEFINED $ENV{VALGRIND_CHECK}) if(DEFINED ENV{VALGRIND_CHECK})
message(STATUS "Defining EXITFREE for valgrind checks")
add_definitions(-DEXITFREE) add_definitions(-DEXITFREE)
endif() endif()

View File

@ -14,13 +14,18 @@
#include "misc2.h" #include "misc2.h"
#include "file_search.h" #include "file_search.h"
#include "blowfish.h" #include "blowfish.h"
#include "buffer.h"
#include "charset.h" #include "charset.h"
#include "diff.h"
#include "edit.h" #include "edit.h"
#include "eval.h" #include "eval.h"
#include "ex_cmds.h"
#include "ex_docmd.h" #include "ex_docmd.h"
#include "ex_getln.h" #include "ex_getln.h"
#include "fileio.h" #include "fileio.h"
#include "fold.h" #include "fold.h"
#include "getchar.h"
#include "mark.h"
#include "mbyte.h" #include "mbyte.h"
#include "memfile.h" #include "memfile.h"
#include "memline.h" #include "memline.h"
@ -28,8 +33,14 @@
#include "misc1.h" #include "misc1.h"
#include "move.h" #include "move.h"
#include "option.h" #include "option.h"
#include "ops.h"
#include "os_unix.h" #include "os_unix.h"
#include "quickfix.h"
#include "regexp.h"
#include "screen.h" #include "screen.h"
#include "search.h"
#include "spell.h"
#include "syntax.h"
#include "tag.h" #include "tag.h"
#include "term.h" #include "term.h"
#include "ui.h" #include "ui.h"

View File

@ -79,7 +79,7 @@ test1.out: test1.in
# 200 msec is sufficient, but only modern sleep supports a fraction of # 200 msec is sufficient, but only modern sleep supports a fraction of
# a second, fall back to a second if it fails. # a second, fall back to a second if it fails.
@-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
-$(RUN_VIM) $*.in $(RUN_VIM) $*.in
# For flaky tests retry one time. # For flaky tests retry one time.
@/bin/sh -c "if test -f test.out -a $* = test61; then \ @/bin/sh -c "if test -f test.out -a $* = test61; then \