Merge branch 'cc_array-test-1' into cc_array-test-2

swlynch99 · Nov 7, 2015 · 903c4fa · 903c4fa
2 parents 96417d6 + 729e2ab
commit 903c4fa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/stream/cc_sockio.c b/src/stream/cc_sockio.c
@@ -99,7 +99,8 @@ buf_tcp_write(struct buf_sock *s)
     channel_handler_t *h = s->hdl;
     struct buf *buf = s->wbuf;
     rstatus_t status = CC_OK;
-    size_t cap, n;
+    size_t cap;
+    ssize_t n;
 
     ASSERT(c != NULL && h != NULL && buf != NULL);
     ASSERT(h->send != NULL);

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,3 +1,3 @@
 include_directories(${include_directories} CHECK_INCLUDES)
 
-add_subdirectory(cc_array)
+add_subdirectory(array)
diff --git a/test/cc_array/CMakeLists.txt → test/array/CMakeLists.txt b/test/cc_array/CMakeLists.txt → test/array/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(suite cc_array)
+set(suite array)
 set(test_name check_${suite})
 
 set(source check_${suite}.c)

diff --git a/test/cc_array/check_cc_array.c → test/array/check_array.c b/test/cc_array/check_cc_array.c → test/array/check_array.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#define SUITE_NAME "cc_array"
+#define SUITE_NAME "array"
 #define DEBUG_LOG  SUITE_NAME ".log"
 
 /*
@@ -78,7 +78,7 @@ END_TEST
  * test suite
  */
 static Suite *
-cc_array_suite(void)
+array_suite(void)
 {
     Suite *s = suite_create(SUITE_NAME);
 
@@ -103,7 +103,7 @@ main(void)
     /* setup */
     test_setup();
 
-    Suite *suite = cc_array_suite();
+    Suite *suite = array_suite();
     SRunner *srunner = srunner_create(suite);
     srunner_set_log(srunner, DEBUG_LOG);
     srunner_run_all(srunner, CK_ENV); /* set CK_VEBOSITY in ENV to customize */