From fe451b02ee3c9d3f88d1ba56c8f00e474002c18d Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Thu, 13 Jan 2011 13:37:13 +0100 Subject: [PATCH] Create proper tests/ subdir. --- Makefile.am | 11 +--------- configure.ac | 1 + tests/Makefile.am | 38 ++++++++++++++++++++++++++++++++++ selftest.c => tests/selftest.c | 0 4 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 tests/Makefile.am rename selftest.c => tests/selftest.c (100%) diff --git a/Makefile.am b/Makefile.am index 8ad0610..f42adc8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ # Subdirectories -SUBDIRS=ykcore +SUBDIRS=ykcore tests ACLOCAL_AMFLAGS = -I m4 @@ -67,15 +67,6 @@ ykpersonalize_LDADD = ./libykpers-1.la ./ykcore/libykcore.la dist_man1_MANS = ykpersonalize.1 -# Self tests. - -AM_LDFLAGS = -no-install -LDADD = ./libykpers-1.la - -ctests = selftest$(EXEEXT) -check_PROGRAMS = $(ctests) -TESTS = $(ctests) - # Dist docs from wiki. EXTRA_DIST = doc/Compatibility.wiki doc/MakeRelease.wiki doc/ReadMe.wiki doc/UsbhidIssue.wiki doc/WindowsBuild.wiki diff --git a/configure.ac b/configure.ac index f27fec0..891c369 100644 --- a/configure.ac +++ b/configure.ac @@ -106,6 +106,7 @@ AC_CONFIG_FILES([ Makefile ykpers-1.pc ykcore/Makefile + tests/Makefile ]) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..392a939 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,38 @@ +# Copyright (c) 2011 Yubico AB +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Self tests. + +AM_LDFLAGS = -no-install +AM_CFLAGS=-I$(srcdir)/.. -I$(srcdir)/../ykcore +LDADD = ../libykpers-1.la + +ykpersonalize_LDADD = ../libykpers-1.la ../ykcore/libykcore.la + +ctests = selftest$(EXEEXT) +check_PROGRAMS = $(ctests) +TESTS = $(ctests) diff --git a/selftest.c b/tests/selftest.c similarity index 100% rename from selftest.c rename to tests/selftest.c -- 2.39.5