add minimal test

Author: wsldankers

Makefile.am

@@ -1,13 +1,20 @@
-bin_PROGRAMS = hardhat mkhardhat
-hardhat_SOURCES = src/hardhat.c
-hardhat_LDADD = libhardhat.la
-mkhardhat_SOURCES = src/mkhardhat.c
-mkhardhat_LDADD = libhardhat.la
+bin_PROGRAMS = bin/hardhat bin/mkhardhat
+bin_hardhat_SOURCES = src/hardhat.c
+bin_hardhat_LDADD = lib/libhardhat.la
+bin_mkhardhat_SOURCES = src/mkhardhat.c
+bin_mkhardhat_LDADD = lib/libhardhat.la
 
-lib_LTLIBRARIES = libhardhat.la
-libhardhat_la_SOURCES = src/hashtable.c src/hashtable.h src/layout.h src/maker.c src/maker.h src/reader.c src/reader.h src/murmur3.c src/murmur3.h src/readerimpl.h
-libhardhat_la_LDFLAGS = -Wl,--version-script,$(srcdir)/libhardhat.ver
-libhardhat_la_LIBADD = -lrt
+noinst_PROGRAMS = tests/hardhat
+tests_hardhat_SOURCES = tests/hardhat.c
+tests_hardhat_LDADD = lib/libhardhat.la
+
+LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(top_srcdir)/tests/log-driver
+TESTS = tests/hardhat
+
+lib_LTLIBRARIES = lib/libhardhat.la
+lib_libhardhat_la_SOURCES = src/hashtable.c src/hashtable.h src/layout.h src/maker.c src/maker.h src/reader.c src/reader.h src/murmur3.c src/murmur3.h src/readerimpl.h
+lib_libhardhat_la_LDFLAGS = -Wl,--version-script,$(srcdir)/libhardhat.ver
+lib_libhardhat_la_LIBADD = -lrt
 
 hh_HEADERS = src/layout.h src/reader.h src/hashtable.h src/maker.h
 hhdir = $(pkgincludedir)

configure.ac

@@ -3,6 +3,7 @@
 AC_INIT(hardhat, 1.1.5, [email protected])
 AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/hardhat.c])
 AC_CONFIG_HEADERS([src/config.h])
 
@@ -37,24 +38,11 @@ AC_CHECK_LIB(rt, clock_gettime, [true], [
 AC_CHECK_FUNCS([fpurge __fpurge fileno], [break])
 AC_CHECK_HEADERS([stdio_ext.h])
 
-AC_DEFUN([MY_GCC_BUILTIN], [
-	AS_VAR_PUSHDEF([ac_var], [ax_cv_have_builtin_$1])
-
-	AC_CACHE_CHECK([for __builtin_$1], [ac_var], [
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([], [__builtin_$1($2)])], 
-			[AS_VAR_SET([ac_var], [yes])], [AS_VAR_SET([ac_var], [no])])
-	])
-
-	case AS_VAR_GET([ac_var]) in yes)
-		AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_BUILTIN_$1), 1, [has GCC __builtin_$1 function])
-	esac
-
-	AS_VAR_POPDEF([ac_var])
-])
-
 MY_GCC_BUILTIN(bswap16, 0)
 MY_GCC_BUILTIN(bswap32, 0)
 MY_GCC_BUILTIN(bswap64, 0)
 
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

m4/gcc-builtin.m4

@@ -0,0 +1,14 @@
+AC_DEFUN([MY_GCC_BUILTIN], [
+	AS_VAR_PUSHDEF([ac_var], [ax_cv_have_builtin_$1])
+
+	AC_CACHE_CHECK([for __builtin_$1], [ac_var], [
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([], [__builtin_$1($2)])], 
+			[AS_VAR_SET([ac_var], [yes])], [AS_VAR_SET([ac_var], [no])])
+	])
+
+	case AS_VAR_GET([ac_var]) in yes)
+		AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_BUILTIN_$1), 1, [has GCC __builtin_$1 function])
+	esac
+
+	AS_VAR_POPDEF([ac_var])
+])

src/maker.c

@@ -231,6 +231,7 @@ static size_t pad4k(size_t x) {
 	return -x % 4096;
 }
 
+__attribute__((unused))
 static size_t adaptive_padding(size_t offset, size_t length, size_t elsize, size_t pagesize) {
 	size_t align = -offset % elsize;
 	offset += align;

tests/hardhat.c

@@ -0,0 +1,45 @@
+#include <stdio.h>
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "reader.h"
+#include "maker.h"
+
+static unsigned int testcounter;
+
+static void tap(bool test, const char *description) {
+	testcounter++;
+	printf("%s %u - %s\n", test ? "ok" : "not ok", testcounter, description);
+}
+
+static void bail(const char *description) {
+	printf("Bailing out! %s\n", description);
+	exit(1);
+}
+
+int main(void) {
+	char *filename;
+	const char *tmpdir;
+	hardhat_maker_t *hhm;
+
+	tmpdir = getenv("TMPDIR");
+	if(!tmpdir) bail("no $TMPDIR set");
+
+	filename = malloc(strlen(tmpdir) + 20);
+	if(!filename) bail("no memory");
+
+	sprintf(filename, "%s/test.hh", tmpdir);
+	hhm = hardhat_maker_new(filename);
+	if(!hhm) bail("no hardhat_maker object");
+
+	tap(true, "able to create a hardhat_maker");
+
+	tap(hardhat_maker_finish(hhm), "close the hardhat_maker # TODO");
+
+	hardhat_maker_free(hhm);
+
+	printf("1..%u\n", testcounter);
+	return 0;
+}

tests/log-driver

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+set -e
+
+tmp=$(mktemp -d)
+trap 'rm -rf -- "$tmp"' EXIT QUIT INT HUP TERM
+
+export TMPDIR=$tmp
+
+sh tap-driver.sh "$@"