tests: Go to cleanup label by default on socket connect failure.

Most of the time, we should go to the cleanup label, rather than
returning -1 immediately (which may lead to some cleanup getting
skipped); add a second macro for the old behavior.

Author: InterLinked1

tests/test.c

@@ -190,7 +190,7 @@ static int parse_options(int argc, char *argv[])
 			option_debug++;
 			break;
 		case 'D':
-		if (option_debug_bbs == MAX_DEBUG) {
+			if (option_debug_bbs == MAX_DEBUG) {
 				fprintf(stderr, "Maximum BBS debug level is %d\n", MAX_DEBUG);
 				return -1;
 			}

tests/test.h

@@ -154,7 +154,8 @@ int test_client_drain(int fd, int ms);
 /* We really may need up to 150ms when under valgrind */
 #define CLIENT_DRAIN(fd) test_client_drain(fd, 150)
 
-#define REQUIRE_FD(fd) if (fd < 0) { bbs_error("File descriptor is not set\n"); return -1; }
+#define REQUIRE_FD(fd) if (fd < 0) { bbs_error("File descriptor is not set\n"); goto cleanup; }
+#define REQUIRE_FD_RETURN(fd) if (fd < 0) { bbs_error("File descriptor is not set\n"); return -1; }
 
 #define DIRECTORY_EXPECT_FILE_COUNT(dir, cnt) { \
 	int _dir_cnt = test_dir_file_count(dir); \

tests/test_imap_fetch.c

@@ -167,7 +167,7 @@ static int make_messages(void)
 
 	send_count = 0;
 	clientfd = test_make_socket(25);
-	REQUIRE_FD(clientfd);
+	REQUIRE_FD_RETURN(clientfd);
 
 	res |= send_message(clientfd, "messages/multipart.eml");
 	res |= send_message(clientfd, "messages/multipart2.eml");

tests/test_telnet.c

@@ -132,6 +132,7 @@ static int run(void)
 
 	res = 0;
 
+cleanup:
 	cleanup_fds(fds);
 	return res;
 }

tests/test_webmail.c

@@ -178,7 +178,7 @@ static int send_messages(void)
 	int num_messages = 25;
 
 	clientfd = test_make_socket(25);
-	REQUIRE_FD(clientfd);
+	REQUIRE_FD_RETURN(clientfd);
 
 	while (num_messages--) {
 		res |= send_message(clientfd);