summaryrefslogtreecommitdiffstats
path: root/lib/tests
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-02-12 12:03:58 (GMT)
committerThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-02-12 12:03:58 (GMT)
commitabbad00edd7f5f3d33ae77a9d5ac338e5bea5fb3 (patch)
tree0d55fb4d8e5ad7a9376d1bccdea31104cbecacfe /lib/tests
parentbd7029a99b0c2974265c6665638ef14a052f42ab (diff)
downloadmonitoring-plugins-abbad00edd7f5f3d33ae77a9d5ac338e5bea5fb3.tar.gz
Import Gnulib floorf and base64 and removed our old base64 library.
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1926 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'lib/tests')
-rw-r--r--lib/tests/Makefile.am2
-rw-r--r--lib/tests/test_base64.c10
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 0ddc8ab..bd25ccf 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -36,7 +36,7 @@ test_cmd_LDADD = ../utils_cmd.o ../utils_base.o
36test_base64_SOURCES = test_base64.c 36test_base64_SOURCES = test_base64.c
37test_base64_CFLAGS = -g -I.. 37test_base64_CFLAGS = -g -I..
38test_base64_LDFLAGS = -L/usr/local/lib -ltap 38test_base64_LDFLAGS = -L/usr/local/lib -ltap
39test_base64_LDADD = ../base64.o 39test_base64_LDADD = $(top_srcdir)/gl/base64.o
40 40
41test: ${noinst_PROGRAMS} 41test: ${noinst_PROGRAMS}
42 perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) 42 perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
diff --git a/lib/tests/test_base64.c b/lib/tests/test_base64.c
index e3ff3e3..650cfa1 100644
--- a/lib/tests/test_base64.c
+++ b/lib/tests/test_base64.c
@@ -18,13 +18,12 @@
18*****************************************************************************/ 18*****************************************************************************/
19 19
20#include "common.h" 20#include "common.h"
21#include "base64.h" 21#include "gl/base64.h"
22#include "tap.h" 22#include "tap.h"
23 23
24int 24int
25main (int argc, char **argv) 25main (int argc, char **argv)
26{ 26{
27#if 0 /* The current base64 function doesn't work on 8bit data */
28 char random[1024] = { 27 char random[1024] = {
29 0x8b,0xb0,0xc4,0xe2,0xfc,0x22,0x9f,0x0d,0x85,0xe7,0x2c,0xaa,0x39,0xa1,0x46,0x88, 28 0x8b,0xb0,0xc4,0xe2,0xfc,0x22,0x9f,0x0d,0x85,0xe7,0x2c,0xaa,0x39,0xa1,0x46,0x88,
30 0x50,0xe6,0x34,0x37,0x0b,0x45,0x4b,0xb8,0xb2,0x86,0x7a,0x3e,0x7f,0x0c,0x40,0x18, 29 0x50,0xe6,0x34,0x37,0x0b,0x45,0x4b,0xb8,0xb2,0x86,0x7a,0x3e,0x7f,0x0c,0x40,0x18,
@@ -180,8 +179,9 @@ main (int argc, char **argv)
180 0x46,0x62,0x5a,0x61,0x35,0x52,0x6e,0x50,0x59,0x43,0x4f,0x36,0x4f,0x70,0x4d,0x6c, 179 0x46,0x62,0x5a,0x61,0x35,0x52,0x6e,0x50,0x59,0x43,0x4f,0x36,0x4f,0x70,0x4d,0x6c,
181 0x41,0x6e,0x6a,0x4d,0x56,0x41,0x3d,0x3d 180 0x41,0x6e,0x6a,0x4d,0x56,0x41,0x3d,0x3d
182 }; 181 };
183#endif
184 182
183#if 0
184 /* The old base64 function didn't work on 8bit data, below is 7bit */
185 char random[1024] = { 185 char random[1024] = {
186 0x0b,0x30,0x44,0x62,0x7c,0x22,0x1f,0x0d,0x05,0x67,0x2c,0x2a,0x39,0x21,0x46,0x08, 186 0x0b,0x30,0x44,0x62,0x7c,0x22,0x1f,0x0d,0x05,0x67,0x2c,0x2a,0x39,0x21,0x46,0x08,
187 0x50,0x66,0x34,0x37,0x0b,0x45,0x4b,0x38,0x32,0x06,0x7a,0x3e,0x7f,0x0c,0x40,0x18, 187 0x50,0x66,0x34,0x37,0x0b,0x45,0x4b,0x38,0x32,0x06,0x7a,0x3e,0x7f,0x0c,0x40,0x18,
@@ -336,11 +336,13 @@ main (int argc, char **argv)
336 0x46,0x54,0x5a,0x61,0x5a,0x52,0x6c,0x50,0x59,0x43,0x4d,0x36,0x4f,0x68,0x4d,0x6c, 336 0x46,0x54,0x5a,0x61,0x5a,0x52,0x6c,0x50,0x59,0x43,0x4d,0x36,0x4f,0x68,0x4d,0x6c,
337 0x41,0x6e,0x68,0x4d,0x56,0x41,0x3d,0x3d,0x00 337 0x41,0x6e,0x68,0x4d,0x56,0x41,0x3d,0x3d,0x00
338 }; 338 };
339#endif
340
339 char *b64_test; 341 char *b64_test;
340 342
341 plan_tests(1); 343 plan_tests(1);
342 344
343 b64_test = base64 (random, 1024); 345 base64_encode_alloc (random, 1024, &b64_test);
344 346
345 ok(strcmp(b64_known, b64_test) == 0, 347 ok(strcmp(b64_known, b64_test) == 0,
346 "Test matching a base64 encoded 1024 bytes random string"); 348 "Test matching a base64 encoded 1024 bytes random string");