summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
Diffstat (limited to 'regress')
-rw-r--r--regress/Makefile6
-rw-r--r--regress/unittests/sshbuf/test_sshbuf.c6
-rw-r--r--regress/unittests/sshbuf/test_sshbuf_fixed.c6
-rw-r--r--regress/unittests/sshbuf/test_sshbuf_fuzz.c4
-rw-r--r--regress/unittests/sshbuf/test_sshbuf_getput_basic.c4
-rw-r--r--regress/unittests/sshbuf/test_sshbuf_getput_crypto.c4
-rw-r--r--regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c4
-rw-r--r--regress/unittests/sshbuf/test_sshbuf_misc.c4
-rw-r--r--regress/unittests/sshbuf/tests.c2
-rw-r--r--regress/unittests/test_helper/fuzz.c2
-rw-r--r--regress/unittests/test_helper/test_helper.c6
11 files changed, 36 insertions, 12 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 6e3b8d634..1e1f68dc3 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,6 +1,6 @@
1# $OpenBSD: Makefile,v 1.68 2014/01/25 04:35:32 dtucker Exp $ 1# $OpenBSD: Makefile,v 1.68 2014/01/25 04:35:32 dtucker Exp $
2 2
3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t-exec 3REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t-exec
4tests: $(REGRESS_TARGETS) 4tests: $(REGRESS_TARGETS)
5 5
6# Interop tests are not run by default 6# Interop tests are not run by default
@@ -180,3 +180,7 @@ t-exec-interop: ${INTEROP_TESTS:=.sh}
180 180
181# Not run by default 181# Not run by default
182interop: ${INTEROP_TARGETS} 182interop: ${INTEROP_TARGETS}
183
184# Unit tests, built by top-level Makefile
185unit:
186 ${.OBJDIR}/unittests/sshbuf/test_sshbuf
diff --git a/regress/unittests/sshbuf/test_sshbuf.c b/regress/unittests/sshbuf/test_sshbuf.c
index 834dcd050..85eacd66f 100644
--- a/regress/unittests/sshbuf/test_sshbuf.c
+++ b/regress/unittests/sshbuf/test_sshbuf.c
@@ -5,6 +5,9 @@
5 * Placed in the public domain 5 * Placed in the public domain
6 */ 6 */
7 7
8#define SSHBUF_INTERNAL 1 /* access internals for testing */
9#include "includes.h"
10
8#include <sys/types.h> 11#include <sys/types.h>
9#include <sys/param.h> 12#include <sys/param.h>
10#include <stdio.h> 13#include <stdio.h>
@@ -12,10 +15,9 @@
12#include <stdlib.h> 15#include <stdlib.h>
13#include <string.h> 16#include <string.h>
14 17
15#include "test_helper.h" 18#include "../test_helper/test_helper.h"
16 19
17#include "ssherr.h" 20#include "ssherr.h"
18#define SSHBUF_INTERNAL 1 /* access internals for testing */
19#include "sshbuf.h" 21#include "sshbuf.h"
20 22
21void sshbuf_tests(void); 23void sshbuf_tests(void);
diff --git a/regress/unittests/sshbuf/test_sshbuf_fixed.c b/regress/unittests/sshbuf/test_sshbuf_fixed.c
index 62c815a2e..52dc84b6f 100644
--- a/regress/unittests/sshbuf/test_sshbuf_fixed.c
+++ b/regress/unittests/sshbuf/test_sshbuf_fixed.c
@@ -5,6 +5,9 @@
5 * Placed in the public domain 5 * Placed in the public domain
6 */ 6 */
7 7
8#define SSHBUF_INTERNAL 1 /* access internals for testing */
9#include "includes.h"
10
8#include <sys/types.h> 11#include <sys/types.h>
9#include <sys/param.h> 12#include <sys/param.h>
10#include <stdio.h> 13#include <stdio.h>
@@ -12,9 +15,8 @@
12#include <stdlib.h> 15#include <stdlib.h>
13#include <string.h> 16#include <string.h>
14 17
15#include "test_helper.h" 18#include "../test_helper/test_helper.h"
16 19
17#define SSHBUF_INTERNAL 1 /* access internals for testing */
18#include "sshbuf.h" 20#include "sshbuf.h"
19#include "ssherr.h" 21#include "ssherr.h"
20 22
diff --git a/regress/unittests/sshbuf/test_sshbuf_fuzz.c b/regress/unittests/sshbuf/test_sshbuf_fuzz.c
index a014b048c..d902ac460 100644
--- a/regress/unittests/sshbuf/test_sshbuf_fuzz.c
+++ b/regress/unittests/sshbuf/test_sshbuf_fuzz.c
@@ -5,6 +5,8 @@
5 * Placed in the public domain 5 * Placed in the public domain
6 */ 6 */
7 7
8#include "includes.h"
9
8#include <sys/types.h> 10#include <sys/types.h>
9#include <sys/param.h> 11#include <sys/param.h>
10#include <stdio.h> 12#include <stdio.h>
@@ -12,7 +14,7 @@
12#include <stdlib.h> 14#include <stdlib.h>
13#include <string.h> 15#include <string.h>
14 16
15#include "test_helper.h" 17#include "../test_helper/test_helper.h"
16 18
17#include "ssherr.h" 19#include "ssherr.h"
18#include "sshbuf.h" 20#include "sshbuf.h"
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_basic.c b/regress/unittests/sshbuf/test_sshbuf_getput_basic.c
index 2d469ec11..cf4d0a343 100644
--- a/regress/unittests/sshbuf/test_sshbuf_getput_basic.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_basic.c
@@ -5,6 +5,8 @@
5 * Placed in the public domain 5 * Placed in the public domain
6 */ 6 */
7 7
8#include "includes.h"
9
8#include <sys/types.h> 10#include <sys/types.h>
9#include <sys/param.h> 11#include <sys/param.h>
10#include <stdio.h> 12#include <stdio.h>
@@ -12,7 +14,7 @@
12#include <stdlib.h> 14#include <stdlib.h>
13#include <string.h> 15#include <string.h>
14 16
15#include "test_helper.h" 17#include "../test_helper/test_helper.h"
16#include "ssherr.h" 18#include "ssherr.h"
17#include "sshbuf.h" 19#include "sshbuf.h"
18 20
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
index d7d4dc378..53290a64c 100644
--- a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
@@ -5,6 +5,8 @@
5 * Placed in the public domain 5 * Placed in the public domain
6 */ 6 */
7 7
8#include "includes.h"
9
8#include <sys/types.h> 10#include <sys/types.h>
9#include <sys/param.h> 11#include <sys/param.h>
10#include <stdio.h> 12#include <stdio.h>
@@ -16,7 +18,7 @@
16#include <openssl/ec.h> 18#include <openssl/ec.h>
17#include <openssl/objects.h> 19#include <openssl/objects.h>
18 20
19#include "test_helper.h" 21#include "../test_helper/test_helper.h"
20#include "ssherr.h" 22#include "ssherr.h"
21#include "sshbuf.h" 23#include "sshbuf.h"
22 24
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
index a382ee154..eed2d6025 100644
--- a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
@@ -5,6 +5,8 @@
5 * Placed in the public domain 5 * Placed in the public domain
6 */ 6 */
7 7
8#include "includes.h"
9
8#include <sys/types.h> 10#include <sys/types.h>
9#include <sys/param.h> 11#include <sys/param.h>
10#include <stdio.h> 12#include <stdio.h>
@@ -16,7 +18,7 @@
16#include <openssl/ec.h> 18#include <openssl/ec.h>
17#include <openssl/objects.h> 19#include <openssl/objects.h>
18 20
19#include "test_helper.h" 21#include "../test_helper/test_helper.h"
20#include "ssherr.h" 22#include "ssherr.h"
21#include "sshbuf.h" 23#include "sshbuf.h"
22 24
diff --git a/regress/unittests/sshbuf/test_sshbuf_misc.c b/regress/unittests/sshbuf/test_sshbuf_misc.c
index a5b1ab2c9..a47f9f0bf 100644
--- a/regress/unittests/sshbuf/test_sshbuf_misc.c
+++ b/regress/unittests/sshbuf/test_sshbuf_misc.c
@@ -5,6 +5,8 @@
5 * Placed in the public domain 5 * Placed in the public domain
6 */ 6 */
7 7
8#include "includes.h"
9
8#include <sys/types.h> 10#include <sys/types.h>
9#include <sys/param.h> 11#include <sys/param.h>
10#include <stdio.h> 12#include <stdio.h>
@@ -12,7 +14,7 @@
12#include <stdlib.h> 14#include <stdlib.h>
13#include <string.h> 15#include <string.h>
14 16
15#include "test_helper.h" 17#include "../test_helper/test_helper.h"
16 18
17#include "sshbuf.h" 19#include "sshbuf.h"
18 20
diff --git a/regress/unittests/sshbuf/tests.c b/regress/unittests/sshbuf/tests.c
index 8397e4011..1557e4342 100644
--- a/regress/unittests/sshbuf/tests.c
+++ b/regress/unittests/sshbuf/tests.c
@@ -5,7 +5,7 @@
5 * Placed in the public domain 5 * Placed in the public domain
6 */ 6 */
7 7
8#include "test_helper.h" 8#include "../test_helper/test_helper.h"
9 9
10void sshbuf_tests(void); 10void sshbuf_tests(void);
11void sshbuf_getput_basic_tests(void); 11void sshbuf_getput_basic_tests(void);
diff --git a/regress/unittests/test_helper/fuzz.c b/regress/unittests/test_helper/fuzz.c
index b64af24ed..63b2370d2 100644
--- a/regress/unittests/test_helper/fuzz.c
+++ b/regress/unittests/test_helper/fuzz.c
@@ -17,6 +17,8 @@
17 17
18/* Utility functions/framework for fuzz tests */ 18/* Utility functions/framework for fuzz tests */
19 19
20#include "includes.h"
21
20#include <sys/types.h> 22#include <sys/types.h>
21 23
22#include <assert.h> 24#include <assert.h>
diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c
index 8f0bbdec9..5881538ee 100644
--- a/regress/unittests/test_helper/test_helper.c
+++ b/regress/unittests/test_helper/test_helper.c
@@ -17,6 +17,8 @@
17 17
18/* Utility functions/framework for regress tests */ 18/* Utility functions/framework for regress tests */
19 19
20#include "includes.h"
21
20#include <sys/types.h> 22#include <sys/types.h>
21#include <sys/param.h> 23#include <sys/param.h>
22 24
@@ -30,7 +32,9 @@
30 32
31#include <openssl/bn.h> 33#include <openssl/bn.h>
32 34
33#include <vis.h> 35#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
36# include <vis.h>
37#endif
34 38
35#include "test_helper.h" 39#include "test_helper.h"
36 40
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 04:46:52 +0000