Skip to content

Commit

Permalink
Build with basic sanitizing on OS X
Browse files Browse the repository at this point in the history
Disabling build using GCC on OS X, because it's still using clang.
  • Loading branch information
xaizek committed Mar 2, 2019
1 parent 451381b commit 1a034c2
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 11 deletions.
20 changes: 12 additions & 8 deletions .travis.yml
@@ -1,13 +1,17 @@
language: c
sudo: false

os:
- linux
- osx

compiler:
- gcc
- clang
matrix:
include:
- os: linux
compiler: gcc
- os: linux
compiler: clang
- os: osx
compiler: gcc
env: CONFIGURE_EXTRA=--with-sanitize=basic
- os: osx
compiler: clang

env:
global:
Expand Down Expand Up @@ -37,7 +41,7 @@ script:
pip install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1 &&
./configure --disable-dependency-tracking --enable-coverage;
else
./configure --disable-dependency-tracking;
./configure --disable-dependency-tracking $CONFIGURE_EXTRA;
fi
) &&
make -j4 &&
Expand Down
14 changes: 11 additions & 3 deletions src/vifm.c
Expand Up @@ -333,13 +333,21 @@ vifm_main(int argc, char *argv[])
vle_aucmd_execute("DirEnter", flist_get_dir(&rwin), &rwin);
}

update_screen(UT_FULL);
modes_update();

/* Run startup commands after loading file lists into views, so that commands
* like +1 work. */
if(window_shows_dirlist(&lwin))
{
(void)populate_dir_list(&lwin, 0);
}
if(window_shows_dirlist(&rwin))
{
(void)populate_dir_list(&rwin, 0);
}
exec_startup_commands(&vifm_args);

update_screen(UT_REDRAW);
modes_update();

curr_stats.load_stage = 3;

event_loop(&quit);
Expand Down
4 changes: 4 additions & 0 deletions tests/Makefile
Expand Up @@ -26,6 +26,7 @@
#
# make DEBUG=1 ... -- builds debug version
# make DEBUG=gdb ... -- builds debug version and loads suite into gdb
# make DEBUG=cgdb ... -- builds debug version and loads suite into cgdb
# make DEBUG=rr ... -- builds debug version and loads suite into rr
# make DEBUG=valgrind ... -- builds debug version and runs it under valgrind
# (see valgrind-report file after a run)
Expand Down Expand Up @@ -189,6 +190,9 @@ ifdef DEBUG
ifeq ($(DEBUG),gdb)
TEST_RUN_PREFIX := gdb -q --args
endif
ifeq ($(DEBUG),cgdb)
TEST_RUN_PREFIX := cgdb -- -q --args
endif
ifeq ($(DEBUG),rr)
TEST_RUN_PREFIX := rr record
endif
Expand Down

0 comments on commit 1a034c2

Please sign in to comment.