From 8752ec3b024e6642b7ecd24207d3bf4accfe5aba Mon Sep 17 00:00:00 2001 From: deva Date: Thu, 17 Dec 2009 12:43:40 +0000 Subject: New test system. --- tools/PracroAdd | 16 ++++++++++++---- tools/test | 5 ++++- tools/test.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/testlist | 29 ++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 5 deletions(-) create mode 100644 tools/test.h create mode 100755 tools/testlist (limited to 'tools') diff --git a/tools/PracroAdd b/tools/PracroAdd index c2ffdf0..2ceda59 100644 --- a/tools/PracroAdd +++ b/tools/PracroAdd @@ -60,11 +60,19 @@ function ccfile() { local hn=`echo $1 | cut -d'.' -f1 | tr 'a-z.' 'A-Z_'` echo "#ifdef TEST_${hn}" >> $1; + echo "//Additional dependency files" >> $1; + echo "//deps:" >> $1; + echo "//Required cflags (autoconf vars may be used)" >> $1; + echo "//cflags:" >> $1; + echo "//Required link options (autoconf vars may be used)" >> $1; + echo "//libs:" >> $1; + echo "#include \"test.h\"" >> $1; echo "" >> $1; - echo "int main()" >> $1; - echo "{" >> $1; - echo " return 0;" >> $1; - echo "}" >> $1; + echo "TEST_BEGIN;" >> $1; + echo "" >> $1; + echo "// TODO: Put some testcode here (see test.h for usable macros)." >> $1; + echo "" >> $1; + echo "TEST_END;" >> $1; echo "" >> $1; echo "#endif/*TEST_${hn}*/" >> $1; } diff --git a/tools/test b/tools/test index 09c2c81..69d8e7e 100755 --- a/tools/test +++ b/tools/test @@ -5,7 +5,9 @@ UPPER=`echo $TEST | tr 'a-z.' 'A-Z_'` OUTPUT=test_$TEST DEFINE=TEST_$UPPER -COMPILE="g++ -g -Wall -Werror -D$DEFINE -o $OUTPUT $*" +SCRIPTDIR=`dirname $0` + +COMPILE="g++ -I$SCRIPTDIR -g -Wall -Werror -D$DEFINE -o $OUTPUT $*" echo -e "\033[0;2mTesting $TEST:" echo Testing $TEST: > $OUTPUT.log @@ -26,6 +28,7 @@ if ${COMPILE} >> ${OUTPUT}.log 2>&1; then else echo -e "\r\t\t\t\t\t\t[\033[1;31mFailure\033[0;2m]" echo "[Failure]" >> $OUTPUT.log + rm -f $OUTPUT fi else echo -e "\r\t\t\t\t\t\t[\033[1;31mFailure\033[0;2m]" diff --git a/tools/test.h b/tools/test.h new file mode 100644 index 0000000..58ebd7d --- /dev/null +++ b/tools/test.h @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * test.h + * + * Wed Dec 16 12:33:19 CET 2009 + * Copyright 2009 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of Pracro. + * + * Pracro is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Pracro is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Pracro; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#ifndef __PRACRO_TEST_H__ +#define __PRACRO_TEST_H__ + +#include + +#define TEST_REPORT { printf("\nTest report:\n%d tests\n%d test failed.\n", TEST_num_tests, TEST_num_fails); } + +#define TEST_BEGIN int main() { int TEST_num_fails = 0; int TEST_num_tests = 0; {} +#define TEST_END { TEST_REPORT; return TEST_num_fails != 0; } } +#define TEST_FATAL(m) { printf("\n!!!! Test fatal error !!!!\n"m"\n"); { TEST_END; } + +#define TEST_OK(m) { printf(" OK: "m"\n"); } +#define TEST_FAIL(m) { printf(" FAIL: "m"\n"); TEST_num_fails++; } +#define TEST_MSG(fmt...) { TEST_num_tests++; printf(fmt); printf(" (line %d)\n", __LINE__); } + +#define TEST_TRUE(x, fmt...) { TEST_MSG(fmt); \ + if(x) { TEST_OK(#x" is true.") } \ + else { TEST_FAIL(#x" is not true.") } } + +#define TEST_FALSE(x, fmt...) { TEST_MSG(fmt); \ + if(!x) { TEST_OK(#x" is false.") } \ + else { TEST_FAIL(#x" is not false.") } } + +#define TEST_EQUAL(x, y, fmt...) { TEST_MSG(fmt); \ + if(x == y) { TEST_OK(#x" and "#y" are equal.") } \ + else { TEST_FAIL(#x" and "#y" are not equal.") } } + +#define TEST_NOTEQUAL(x, y, fmt...) { TEST_MSG(fmt); \ + if(x != y) { TEST_OK(#x" and "#y" are not equal.") } \ + else { TEST_FAIL(#x" and "#y" are equal.") } } + +#endif/*__PRACRO_TEST_H__*/ diff --git a/tools/testlist b/tools/testlist new file mode 100755 index 0000000..fca9d95 --- /dev/null +++ b/tools/testlist @@ -0,0 +1,29 @@ +#!/bin/bash + +grep "TEST_BEGIN" *.cc > tmp + +echo -n "TESTFILES=" +while read LINE +do + FILE=`echo $LINE | cut -d':' -f1` + NAME=`echo $FILE | cut -d'.' -f1` + TEST=test_$NAME + echo -ne "$TEST " +done < tmp +echo "" +echo "" + +while read LINE +do + FILE=`echo $LINE | cut -d':' -f1` + NAME=`echo $FILE | cut -d'.' -f1` + DEPS=`cat $FILE | grep "deps:" | cut -d':' -f2` + LIBS=`cat $FILE | grep "libs:" | cut -d':' -f2` + CFLAGS=`cat $FILE | grep "cflags:" | cut -d':' -f2` + TEST=test_$NAME + echo "$TEST: $FILE $DEPS" + echo -e "\t@../../tools/test $FILE $DEPS $CFLAGS $LIBS" + echo "" +done < tmp + +rm -f tmp \ No newline at end of file -- cgit v1.2.3