collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/asan' of https://github.com/czchen/r3 into czchen-feature/asan

Browse source 
Conflicts:
	.travis.yml
This commit is contained in:
c9s 2014-05-22 22:07:52 +08:00
commit 15facc82cc
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -8,7 +8,9 @@ matrix:
- compiler: gcc - compiler: gcc
env: CONFIGURE_OPTION='--enable-debug --with-malloc=jemalloc' COVERALLS=yes VALGRIND=no env: CONFIGURE_OPTION='--enable-debug --with-malloc=jemalloc' COVERALLS=yes VALGRIND=no
- compiler: gcc - compiler: gcc
env: CONFIGURE_OPTION='--enable-debug --with-malloc=jemalloc' COVERALLS=yes VALGRIND=yes LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/ env: CONFIGURE_OPTION='--enable-debug' COVERALLS=yes VALGRIND=yes LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/
- compiler: clang
env: ASAN_OPTIONS=symbolize=1 ASAN_SYMBOLIZER_PATH=/usr/local/clang-3.4/bin/llvm-symbolizer CFLAGS='-fsanitize=address -g -O1'
install: install:
- sudo apt-get update -qq - sudo apt-get update -qq
@ -23,9 +25,9 @@ before_script:
script: script:
- ./autogen.sh - ./autogen.sh
- ./configure $CONFIGURE_OPTION - ./configure $CONFIGURE_OPTION
- make - make V=1
- sudo make install - sudo make install
- if [ "x$VALGRIND" == xyes ]; then make check > /dev/null 2>&1; else make check; fi - if [ "x$VALGRIND" == xyes ]; then make check > /dev/null 2>&1; else make check V=1; fi
- if [ "x$VALGRIND" == xyes ]; then valgrind ./tests/.libs/* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi - if [ "x$VALGRIND" == xyes ]; then valgrind ./tests/.libs/* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi
after_success: after_success:

1
tests/check_slug.c
View file

@ -98,6 +98,7 @@ END_TEST
Suite* r3_suite (void) { Suite* r3_suite (void) {
Suite *suite = suite_create("slug test"); Suite *suite = suite_create("slug test");
TCase *tcase = tcase_create("test_slug"); TCase *tcase = tcase_create("test_slug");
tcase_set_timeout(tcase, 30);
tcase_add_test(tcase, test_contains_slug); tcase_add_test(tcase, test_contains_slug);
tcase_add_test(tcase, test_inside_slug); tcase_add_test(tcase, test_inside_slug);
tcase_add_test(tcase, test_find_slug_pattern); tcase_add_test(tcase, test_find_slug_pattern);

1
tests/check_tree.c
View file

@ -363,6 +363,7 @@ Suite* r3_suite (void) {
Suite *suite = suite_create("blah"); Suite *suite = suite_create("blah");
TCase *tcase = tcase_create("testcase"); TCase *tcase = tcase_create("testcase");
tcase_set_timeout(tcase, 30);
tcase_add_test(tcase, test_r3_node_construct_and_free); tcase_add_test(tcase, test_r3_node_construct_and_free);
tcase_add_test(tcase, test_str_array); tcase_add_test(tcase, test_str_array);
tcase_add_test(tcase, test_ltrim_slash); tcase_add_test(tcase, test_ltrim_slash);