diff --git a/.travis.yml b/.travis.yml index b18310c44f6ea322f95849bc961959429a4b6877..e7dfd7c77aa20b7e989812e85e69678d268e2094 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,6 @@ notifications: on_failure: always matrix: fast_finish: true - allow_failures: - - os: osx env: global: - PKG_CONFIG_PATH="${HOME}/.local/lib/pkgconfig" diff --git a/daemon/bindings.c b/daemon/bindings.c index 08228658539728c0981b0a495d2e10c2d68cbb25..408603a0532bdfa8712e19e486c50e6a6511967b 100644 --- a/daemon/bindings.c +++ b/daemon/bindings.c @@ -174,7 +174,6 @@ static int net_listen_addrs(lua_State *L, int port, int flags) lua_getfield(L, -1, "addr"); if (!lua_isnil(L, -1)) { lua_replace(L, -2); - kr_log_info(" .addr\n"); } else { lua_pop(L, 1); } @@ -182,7 +181,6 @@ static int net_listen_addrs(lua_State *L, int port, int flags) /* Case: string, representing a single address. */ const char *str = lua_tostring(L, -1); if (str != NULL) { - kr_log_info(" string\n"); struct engine *engine = engine_luaget(L); int ret = network_listen(&engine->net, str, port, flags); if (ret != 0) { diff --git a/scripts/embed-lua.sh b/scripts/embed-lua.sh index 403dfa2d070f968371492a8b0bfeca5e88233a10..80f6cba263fb6fffe1f00dfa648539d28a86d783 100755 --- a/scripts/embed-lua.sh +++ b/scripts/embed-lua.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -# clean unnecessary stuff from the lua file -alias strip="sed -e 's/^[\t ]*//g; s/ */ /g; /^--/d; /^$/d'" +# Clean unnecessary stuff from the lua file; note the significant tabulator. +alias strip="sed -e 's/^[ ]*//g; s/ */ /g; /^--/d; /^$/d'" if command -v xxd > /dev/null 2>&1; then strip < "$1" | xxd -i - else