From: Darren Tucker <dtucker@dtucker.net>
Date: Thu, 10 Feb 2022 23:03:06 +0000 (+1100)
Subject: Fix helper include path and remove excess code.
X-Git-Tag: V_8_9_P1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ee53064f476cf163acd5521da45b11b7c57321b;p=thirdparty%2Fopenssh-portable.git

Fix helper include path and remove excess code.

Looks like test_hpdelim.c was imported twice into the same file.
Spotted by kevin.brott at gmail com and chris at cataclysmal org.
---

diff --git a/regress/unittests/misc/test_hpdelim.c b/regress/unittests/misc/test_hpdelim.c
index 9da0159dc..d423023dc 100644
--- a/regress/unittests/misc/test_hpdelim.c
+++ b/regress/unittests/misc/test_hpdelim.c
@@ -15,85 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "test_helper.h"
-
-#include "log.h"
-#include "misc.h"
-#include "xmalloc.h"
-
-void test_hpdelim(void);
-
-void
-test_hpdelim(void)
-{
-	char *orig, *str, *cp, *port;
-
-#define START_STRING(x)	orig = str = xstrdup(x)
-#define DONE_STRING()	free(orig)
-
-	TEST_START("hpdelim host only");
-	START_STRING("host");
-	cp = hpdelim(&str);
-	ASSERT_STRING_EQ(cp, "host");
-	ASSERT_PTR_EQ(str, NULL);
-	DONE_STRING();
-	TEST_DONE();
-
-	TEST_START("hpdelim :port");
-	START_STRING(":1234");
-	cp = hpdelim(&str);
-	ASSERT_STRING_EQ(cp, "");
-	ASSERT_PTR_NE(str, NULL);
-	port = hpdelim(&str);
-	ASSERT_STRING_EQ(port, "1234");
-	ASSERT_PTR_EQ(str, NULL);
-	DONE_STRING();
-	TEST_DONE();
-
-	TEST_START("hpdelim host:port");
-	START_STRING("host:1234");
-	cp = hpdelim(&str);
-	ASSERT_STRING_EQ(cp, "host");
-	ASSERT_PTR_NE(str, NULL);
-	port = hpdelim(&str);
-	ASSERT_STRING_EQ(port, "1234");
-	ASSERT_PTR_EQ(str, NULL);
-	DONE_STRING();
-	TEST_DONE();
-
-	TEST_START("hpdelim [host]:port");
-	START_STRING("[::1]:1234");
-	cp = hpdelim(&str);
-	ASSERT_STRING_EQ(cp, "[::1]");
-	ASSERT_PTR_NE(str, NULL);
-	port = hpdelim(&str);
-	ASSERT_STRING_EQ(port, "1234");
-	ASSERT_PTR_EQ(str, NULL);
-	DONE_STRING();
-	TEST_DONE();
-
-	TEST_START("hpdelim missing ] error");
-	START_STRING("[::1:1234");
-	cp = hpdelim(&str);
-	ASSERT_PTR_EQ(cp, NULL);
-	DONE_STRING();
-	TEST_DONE();
-
-}
-/* 	$OpenBSD: test_hpdelim.c,v 1.2 2022/02/06 22:58:33 dtucker Exp $ */
-/*
- * Regress test for misc hpdelim() and co
- *
- * Placed in the public domain.
- */
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_helper.h"
+#include "../test_helper/test_helper.h"
 
 #include "log.h"
 #include "misc.h"