Merge pull request #1022 from danielhtshih/master

add untracked test_stream_timeout into .gitignore and tests/Makefile.am

.gitignore

@@ -25,6 +25,7 @@ tools/curve_keygen
 tests/test_resource
 tests/test_ipc_wildcard
 tests/test_stream_empty
+tests/test_stream_timeout
 tests/test_issue_566
 tests/test_ctx_destroy
 tests/test_term_endpoint

tests/Makefile.am

@@ -95,6 +95,7 @@ test_router_handover_SOURCES = test_router_handover.cpp
 test_probe_router_SOURCES = test_probe_router.cpp
 test_stream_SOURCES = test_stream.cpp
 test_stream_empty_SOURCES = test_stream_empty.cpp
+test_stream_timeout_SOURCES = test_stream_timeout.cpp
 test_stream_disconnect_SOURCES = test_stream_disconnect.cpp
 test_disconnect_inproc_SOURCES = test_disconnect_inproc.cpp
 test_ctx_options_SOURCES = test_ctx_options.cpp