Skip to content

Travis independent commands #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
etr merged 4 commits into from
Jan 13, 2019
Merged

Travis independent commands #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a98efe
Move make check into an independent execution on travis
etr Jan 13, 2019
a825c08
Fix script
etr Jan 13, 2019
3341abb
Disable custom fd test on darwin
etr Jan 13, 2019
e671ba3
Always check darwin
etr Jan 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,12 @@ script:
qemu-arm -L /usr/arm-linux-gnueabi/ ./.libs/http_utils ;
qemu-arm -L /usr/arm-linux-gnueabi/ ./.libs/threaded ;
fi
else
make check ;
cat test/test-suite.log ;
ls -l /usr/local/lib/ ;
ls -l /usr/lib/ ;
if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ../src/; cppcheck --error-exitcode=1 .; cd ../build; fi
fi
- make check
- cat test/test-suite.log
- ls -l /usr/local/lib/
- ls -l /usr/lib/
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ../src/; cppcheck --error-exitcode=1 .; cd ../build; fi
after_success:
- if [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi
matrix:
Expand Down
7 changes: 7 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,13 @@ else
AM_CFLAGS="$AM_CXXFLAGS -O3"
fi

case $host_os in
darwin* )
AM_CXXFLAGS="$AM_CXXFLAGS -DDARWIN"
AM_CFLAGS="$AM_CFLAGS -DDARWIN"
;;
esac

AC_MSG_CHECKING([whether to build with coverage information])
AC_ARG_ENABLE([coverage],
[AS_HELP_STRING([--enable-coverage],
Expand Down
2 changes: 2 additions & 0 deletions test/integ/ws_start_stop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, enable_options)
LT_END_AUTO_TEST(enable_options)

LT_BEGIN_AUTO_TEST(ws_start_stop_suite, custom_socket)
#ifndef DARWIN
int fd = socket(AF_INET, SOCK_STREAM, 0);

struct sockaddr_in address;
Expand Down Expand Up @@ -269,6 +270,7 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, custom_socket)
curl_easy_cleanup(curl);

ws.stop();
#endif
LT_END_AUTO_TEST(custom_socket)

LT_BEGIN_AUTO_TEST(ws_start_stop_suite, single_resource)
Expand Down