From 64610c7453fc6bc0be7d3f9cb49058fb849be725 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 17 Nov 2011 14:38:54 +0100 Subject: Move server-only tools to server tools folder. --- server/tools/Makefile.am.test | 21 ++++ server/tools/hexify.cc | 62 ++++++++++ server/tools/test | 55 +++++++++ server/tools/test.h | 262 ++++++++++++++++++++++++++++++++++++++++++ server/tools/testlist | 31 +++++ tools/Makefile.am.test | 21 ---- tools/hexify.cc | 62 ---------- tools/test | 55 --------- tools/test.h | 262 ------------------------------------------ tools/testlist | 31 ----- 10 files changed, 431 insertions(+), 431 deletions(-) create mode 100644 server/tools/Makefile.am.test create mode 100644 server/tools/hexify.cc create mode 100755 server/tools/test create mode 100644 server/tools/test.h create mode 100755 server/tools/testlist delete mode 100644 tools/Makefile.am.test delete mode 100644 tools/hexify.cc delete mode 100755 tools/test delete mode 100644 tools/test.h delete mode 100755 tools/testlist diff --git a/server/tools/Makefile.am.test b/server/tools/Makefile.am.test new file mode 100644 index 0000000..cad2627 --- /dev/null +++ b/server/tools/Makefile.am.test @@ -0,0 +1,21 @@ +Makefile.am.test: ${TEST_SOURCE_DEPS} + ${TEST_SCRIPT_DIR}/testlist > Makefile.am.test + @touch Makefile.am + +test: Makefile.am.test $(TESTFILES) + @echo "All tests done." + +test_clean: + rm -Rf lgov + rm -f $(TESTFILES) $(TESTLOGS) + +test_report: + lcov --directory . --capture --output-file app.info + genhtml -o lcov app.info + +test_all: test_clean test test_report + +TESTLOGS = `for F in ${TESTFILES}; do echo $$F.log; done` + +CLEANFILES = $(TESTFILES) $(TESTLOGS) Makefile.am.test *~ + diff --git a/server/tools/hexify.cc b/server/tools/hexify.cc new file mode 100644 index 0000000..8f8b308 --- /dev/null +++ b/server/tools/hexify.cc @@ -0,0 +1,62 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * hexify.cc + * + * Mon Feb 7 08:42:59 CET 2011 + * Copyright 2011 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. + */ +#include + +#define WIDTH 12 + +int main(int argc, char *argv[]) +{ + if(argc < 2) { + printf("Usage %s file\n", argv[0]); + return 1; + } + + FILE *fp = fopen(argv[1], "r"); + if(!fp) { + printf("Could not open %s\n", argv[1]); + return 1; + } + + int cnt = 0; + printf("static const char val[] = {"); + while(!feof(fp)) { + unsigned char c; + int sz = fread(&c, 1, 1, fp); + if(cnt) printf(", "); + if(cnt % WIDTH == 0) printf("\n "); + printf("0x%02x", c); + cnt++; + } + printf("\n};\n"); + printf("static int valsize = %d;\n", cnt); + + fclose(fp); + + return 0; +} + diff --git a/server/tools/test b/server/tools/test new file mode 100755 index 0000000..ec54e70 --- /dev/null +++ b/server/tools/test @@ -0,0 +1,55 @@ +#!/bin/bash + +TEST=`echo -n $1 | cut -d'.' -f1` +UPPER=`echo $TEST | tr 'a-z.' 'A-Z_'` +OUTPUT=test_$TEST +DEFINE=TEST_$UPPER + +SCRIPTDIR=`dirname $0` + +INFILE=$1 +shift +OBJFILES="" +for f in $TEST_DEPS +do + of=`echo -n $f | cut -d'.' -f1`.o; + OBJFILES="$OBJFILES $of" +done + +COMMON_FLAGS="-DHAVE_CONFIG_H -I$SCRIPTDIR -O0 -g -D$DEFINE $TEST_LIBS $TEST_CFLAGS" +CLEAN="rm -f $OBJFILES" +PRECOMPILE="g++ -c $TEST_DEPS $COMMON_FLAGS" +COMPILE="g++ -fprofile-arcs -ftest-coverage -fno-elide-constructors -Wall -Werror $COMMON_FLAGS -o $OUTPUT $INFILE $OBJFILES" + +echo -e "\033[0;2mTesting $TEST:" +echo Testing $TEST: > $OUTPUT.log + +echo -n "* Compiling $TEST test" +echo Compiling $TEST test: > $OUTPUT.log + +echo ${CLEAN} >> $OUTPUT.log +${CLEAN} >> ${OUTPUT}.log 2>&1 +echo ${PRECOMPILE} >> $OUTPUT.log +${PRECOMPILE} >> ${OUTPUT}.log 2>&1 +echo ${COMPILE} >> $OUTPUT.log + +if ${COMPILE} >> ${OUTPUT}.log 2>&1; then + echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]" + echo "[Success]" >> $OUTPUT.log + + echo -n "* Running $TEST test" + echo Running $TEST test: >> $OUTPUT.log + if ./$OUTPUT >> $OUTPUT.log 2>&1; then + echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]" + echo "[Success]" >> $OUTPUT.log + 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]" + echo "[Failure]" >> $OUTPUT.log +fi + +echo \ No newline at end of file diff --git a/server/tools/test.h b/server/tools/test.h new file mode 100644 index 0000000..4770a1e --- /dev/null +++ b/server/tools/test.h @@ -0,0 +1,262 @@ +/* -*- 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 { \ + fprintf(stderr, "\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_OK(m) { \ + fprintf(stderr, " OK: "m"\n"); \ + } + +#define TEST_FAIL(m) { \ + fprintf(stderr, " FAIL: "m"\t\t\t<------------\n"); \ + TEST_num_fails++; \ + } + +#define TEST_FATAL(m) { \ + fprintf(stderr, "FATAL: %s\t\t\t<============\n", m); \ + TEST_num_fails++; \ + { TEST_END; } + +#define TEST_MSG(fmt...) { \ + fprintf(stderr, "\n"); \ + fprintf(stderr, fmt); \ + fprintf(stderr, " (line %d)\n", __LINE__); \ + } + +#define TEST_BASE(fmt...) { \ + TEST_num_tests++; \ + TEST_MSG(fmt); \ + } + +#define TEST_TRUE(x, fmt...) { \ + TEST_BASE(fmt); \ + if(x) { TEST_OK(#x" is true.") } \ + else { TEST_FAIL(#x" is not true.") } \ + } + +#define TEST_FALSE(x, fmt...) { \ + TEST_BASE(fmt); \ + if(!x) { TEST_OK(#x" is false.") } \ + else { TEST_FAIL(#x" is not false.") } \ + } + +#define TEST_EQUAL(x, y, fmt...) { \ + TEST_BASE(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_BASE(fmt); \ + if(x != y) { TEST_OK(#x" and "#y" are not equal.") } \ + else { TEST_FAIL(#x" and "#y" are equal.") } \ + } + +#define TEST_GREATER_THAN(x, y, fmt...) { \ + TEST_BASE(fmt); \ + if(x > y) { TEST_OK(#x" are greater than "#y".") } \ + else { TEST_FAIL(#x" are not greater than "#y".") } \ + } + +#define TEST_LESS_THAN(x, y, fmt...) { \ + TEST_BASE(fmt); \ + if(x < y) { TEST_OK(#x" are less than "#y".") } \ + else { TEST_FAIL(#x" are not less than "#y".") } \ + } + +#define TEST_EQUAL_STR(x, y, fmt...) { \ + TEST_BASE(fmt); \ + std::string __s1 = x; \ + std::string __s2 = y; \ + fprintf(stderr, "Comparing: \"%s\" == \"%s\"\n", \ + __s1.c_str(), __s2.c_str()); \ + if(__s1 == __s2) { \ + TEST_OK(#x" and "#y" are equal."); \ + } else { \ + TEST_FAIL(#x" and "#y" are not equal."); \ + } \ + } + +#define TEST_NOTEQUAL_STR(x, y, fmt...) { \ + TEST_BASE(fmt); \ + std::string __s1 = x; \ + std::string __s2 = y; \ + fprintf(stderr, "Comparing: \"%s\" != \"%s\"\n", \ + __s1.c_str(), __s2.c_str()); \ + if(__s1 != __s2) { \ + TEST_OK(#x" and "#y" not are equal."); \ + } else { \ + TEST_FAIL(#x" and "#y" are equal."); \ + } \ + } + +#define TEST_EQUAL_INT(x, y, fmt...) { \ + TEST_BASE(fmt); \ + int i1 = x; \ + int i2 = y; \ + fprintf(stderr, "Comparing: \"%d\" == \"%d\"\n", i1, i2); \ + if(i1 == i2) { \ + TEST_OK(#x" and "#y" are equal."); \ + } else { \ + TEST_FAIL(#x" and "#y" are not equal."); \ + } \ + } + +#define TEST_NOTEQUAL_INT(x, y, fmt...) { \ + TEST_BASE(fmt); \ + int i1 = x; \ + int i2 = y; \ + fprintf(stderr, "Comparing: \"%d\" != \"%d\"\n", i1, i2); \ + if(i1 != i2) { \ + TEST_OK(#x" and "#y" are not equal."); \ + } else { \ + TEST_FAIL(#x" and "#y" are equal."); \ + } \ + } + +#define TEST_EQUAL_FLOAT(x, y, fmt...) { \ + TEST_BASE(fmt); \ + double d1 = x; \ + double d2 = y; \ + fprintf(stderr, "Comparing: \"%f\" == \"%f\"\n", d1, d2); \ + if(d1 == d2) { \ + TEST_OK(#x" and "#y" are equal."); \ + } else { \ + TEST_FAIL(#x" and "#y" are not equal."); \ + } \ + } + +#define TEST_NOTEQUAL_FLOAT(x, y, fmt...) { \ + TEST_BASE(fmt); \ + double d1 = x; \ + double d2 = y; \ + fprintf(stderr, "Comparing: \"%f\" != \"%f\"\n", d1, d2); \ + if(d1 != d2) { \ + TEST_OK(#x" and "#y" are not equal."); \ + } else { \ + TEST_FAIL(#x" and "#y" are equal."); \ + } \ + } + +#define TEST_GREATER_THAN_INT(x, y, fmt...) { \ + TEST_BASE(fmt); \ + int i1 = x; \ + int i2 = y; \ + fprintf(stderr, "Comparing: \"%d\" > \"%d\"\n", i1, i2); \ + if(i1 > i2) { \ + TEST_OK(#x" are greater than "#y"."); \ + } else { \ + TEST_FAIL(#x" are not greater than "#y"."); \ + } \ + } + +#define TEST_LESS_THAN_INT(x, y, fmt...) { \ + TEST_BASE(fmt); \ + int i1 = x; \ + int i2 = y; \ + fprintf(stderr, "Comparing: \"%d\" < \"%d\"\n", i1, i2); \ + if(i1 < i2) { \ + TEST_OK(#x" are less than "#y"."); \ + } else { \ + TEST_FAIL(#x" are not less than "#y"."); \ + } \ + } + +#define TEST_GREATER_THAN_FLOAT(x, y, fmt...) { \ + TEST_BASE(fmt); \ + double d1 = x; \ + double d2 = y; \ + fprintf(stderr, "Comparing: \"%f\" > \"%f\"\n", d1, d2); \ + if(d1 > d2) { \ + TEST_OK(#x" are greater than "#y"."); \ + } else { \ + TEST_FAIL(#x" are not greater than "#y"."); \ + } \ + } + +#define TEST_LESS_THAN_FLOAT(x, y, fmt...) { \ + TEST_BASE(fmt); \ + double d1 = x; \ + double d2 = y; \ + fprintf(stderr, "Comparing: \"%f\" < \"%f\"\n", d1, d2); \ + if(d1 < d2) { \ + TEST_OK(#x" are less than "#y"."); \ + } else { \ + TEST_FAIL(#x" are not less than "#y"."); \ + } \ + } + +#define TEST_EXCEPTION(x, y, fmt...) { \ + TEST_BASE(fmt); \ + try { \ + x; \ + TEST_FAIL("Exception "#y" was not trown."); \ + } catch( y &e ) { \ + TEST_OK("Exception "#y" was thrown as expected."); \ + } \ + } + +#define TEST_NOTEXCEPTION(x, y, fmt...) { \ + TEST_BASE(fmt); \ + try { \ + x; \ + TEST_OK("Exception "#y" was not trown as expected"); \ + } catch( y &e ) { \ + TEST_FAIL("Exception "#y" was thrown."); \ + } \ + } + +#define TEST_NOEXCEPTION(x, fmt...) { \ + TEST_BASE(fmt); \ + try { \ + x; \ + TEST_OK("Exception was not trown as expected"); \ + } catch( ... ) { \ + TEST_FAIL("Exception was thrown."); \ + } \ + } + +#endif/*__PRACRO_TEST_H__*/ diff --git a/server/tools/testlist b/server/tools/testlist new file mode 100755 index 0000000..01a48e2 --- /dev/null +++ b/server/tools/testlist @@ -0,0 +1,31 @@ +#!/bin/bash + +SCRIPTDIR=`dirname $0` + +grep -l "TEST_BEGIN" *.cc > tmp + +echo -n "TESTFILES=" +while read LINE +do + FILE=$LINE + NAME=`echo $FILE | cut -d'.' -f1` + TEST=test_$NAME + echo -ne "$TEST " +done < tmp +echo "" +echo "" + +while read LINE +do + FILE=$LINE + 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@TEST_DEPS=\"$DEPS\" TEST_CFLAGS=\"$CFLAGS\" TEST_LIBS=\"$LIBS\" ${SCRIPTDIR}/test $FILE" + echo "" +done < tmp + +rm -f tmp \ No newline at end of file diff --git a/tools/Makefile.am.test b/tools/Makefile.am.test deleted file mode 100644 index cad2627..0000000 --- a/tools/Makefile.am.test +++ /dev/null @@ -1,21 +0,0 @@ -Makefile.am.test: ${TEST_SOURCE_DEPS} - ${TEST_SCRIPT_DIR}/testlist > Makefile.am.test - @touch Makefile.am - -test: Makefile.am.test $(TESTFILES) - @echo "All tests done." - -test_clean: - rm -Rf lgov - rm -f $(TESTFILES) $(TESTLOGS) - -test_report: - lcov --directory . --capture --output-file app.info - genhtml -o lcov app.info - -test_all: test_clean test test_report - -TESTLOGS = `for F in ${TESTFILES}; do echo $$F.log; done` - -CLEANFILES = $(TESTFILES) $(TESTLOGS) Makefile.am.test *~ - diff --git a/tools/hexify.cc b/tools/hexify.cc deleted file mode 100644 index 8f8b308..0000000 --- a/tools/hexify.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set et sw=2 ts=2: */ -/*************************************************************************** - * hexify.cc - * - * Mon Feb 7 08:42:59 CET 2011 - * Copyright 2011 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. - */ -#include - -#define WIDTH 12 - -int main(int argc, char *argv[]) -{ - if(argc < 2) { - printf("Usage %s file\n", argv[0]); - return 1; - } - - FILE *fp = fopen(argv[1], "r"); - if(!fp) { - printf("Could not open %s\n", argv[1]); - return 1; - } - - int cnt = 0; - printf("static const char val[] = {"); - while(!feof(fp)) { - unsigned char c; - int sz = fread(&c, 1, 1, fp); - if(cnt) printf(", "); - if(cnt % WIDTH == 0) printf("\n "); - printf("0x%02x", c); - cnt++; - } - printf("\n};\n"); - printf("static int valsize = %d;\n", cnt); - - fclose(fp); - - return 0; -} - diff --git a/tools/test b/tools/test deleted file mode 100755 index ec54e70..0000000 --- a/tools/test +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -TEST=`echo -n $1 | cut -d'.' -f1` -UPPER=`echo $TEST | tr 'a-z.' 'A-Z_'` -OUTPUT=test_$TEST -DEFINE=TEST_$UPPER - -SCRIPTDIR=`dirname $0` - -INFILE=$1 -shift -OBJFILES="" -for f in $TEST_DEPS -do - of=`echo -n $f | cut -d'.' -f1`.o; - OBJFILES="$OBJFILES $of" -done - -COMMON_FLAGS="-DHAVE_CONFIG_H -I$SCRIPTDIR -O0 -g -D$DEFINE $TEST_LIBS $TEST_CFLAGS" -CLEAN="rm -f $OBJFILES" -PRECOMPILE="g++ -c $TEST_DEPS $COMMON_FLAGS" -COMPILE="g++ -fprofile-arcs -ftest-coverage -fno-elide-constructors -Wall -Werror $COMMON_FLAGS -o $OUTPUT $INFILE $OBJFILES" - -echo -e "\033[0;2mTesting $TEST:" -echo Testing $TEST: > $OUTPUT.log - -echo -n "* Compiling $TEST test" -echo Compiling $TEST test: > $OUTPUT.log - -echo ${CLEAN} >> $OUTPUT.log -${CLEAN} >> ${OUTPUT}.log 2>&1 -echo ${PRECOMPILE} >> $OUTPUT.log -${PRECOMPILE} >> ${OUTPUT}.log 2>&1 -echo ${COMPILE} >> $OUTPUT.log - -if ${COMPILE} >> ${OUTPUT}.log 2>&1; then - echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]" - echo "[Success]" >> $OUTPUT.log - - echo -n "* Running $TEST test" - echo Running $TEST test: >> $OUTPUT.log - if ./$OUTPUT >> $OUTPUT.log 2>&1; then - echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]" - echo "[Success]" >> $OUTPUT.log - 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]" - echo "[Failure]" >> $OUTPUT.log -fi - -echo \ No newline at end of file diff --git a/tools/test.h b/tools/test.h deleted file mode 100644 index 4770a1e..0000000 --- a/tools/test.h +++ /dev/null @@ -1,262 +0,0 @@ -/* -*- 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 { \ - fprintf(stderr, "\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_OK(m) { \ - fprintf(stderr, " OK: "m"\n"); \ - } - -#define TEST_FAIL(m) { \ - fprintf(stderr, " FAIL: "m"\t\t\t<------------\n"); \ - TEST_num_fails++; \ - } - -#define TEST_FATAL(m) { \ - fprintf(stderr, "FATAL: %s\t\t\t<============\n", m); \ - TEST_num_fails++; \ - { TEST_END; } - -#define TEST_MSG(fmt...) { \ - fprintf(stderr, "\n"); \ - fprintf(stderr, fmt); \ - fprintf(stderr, " (line %d)\n", __LINE__); \ - } - -#define TEST_BASE(fmt...) { \ - TEST_num_tests++; \ - TEST_MSG(fmt); \ - } - -#define TEST_TRUE(x, fmt...) { \ - TEST_BASE(fmt); \ - if(x) { TEST_OK(#x" is true.") } \ - else { TEST_FAIL(#x" is not true.") } \ - } - -#define TEST_FALSE(x, fmt...) { \ - TEST_BASE(fmt); \ - if(!x) { TEST_OK(#x" is false.") } \ - else { TEST_FAIL(#x" is not false.") } \ - } - -#define TEST_EQUAL(x, y, fmt...) { \ - TEST_BASE(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_BASE(fmt); \ - if(x != y) { TEST_OK(#x" and "#y" are not equal.") } \ - else { TEST_FAIL(#x" and "#y" are equal.") } \ - } - -#define TEST_GREATER_THAN(x, y, fmt...) { \ - TEST_BASE(fmt); \ - if(x > y) { TEST_OK(#x" are greater than "#y".") } \ - else { TEST_FAIL(#x" are not greater than "#y".") } \ - } - -#define TEST_LESS_THAN(x, y, fmt...) { \ - TEST_BASE(fmt); \ - if(x < y) { TEST_OK(#x" are less than "#y".") } \ - else { TEST_FAIL(#x" are not less than "#y".") } \ - } - -#define TEST_EQUAL_STR(x, y, fmt...) { \ - TEST_BASE(fmt); \ - std::string __s1 = x; \ - std::string __s2 = y; \ - fprintf(stderr, "Comparing: \"%s\" == \"%s\"\n", \ - __s1.c_str(), __s2.c_str()); \ - if(__s1 == __s2) { \ - TEST_OK(#x" and "#y" are equal."); \ - } else { \ - TEST_FAIL(#x" and "#y" are not equal."); \ - } \ - } - -#define TEST_NOTEQUAL_STR(x, y, fmt...) { \ - TEST_BASE(fmt); \ - std::string __s1 = x; \ - std::string __s2 = y; \ - fprintf(stderr, "Comparing: \"%s\" != \"%s\"\n", \ - __s1.c_str(), __s2.c_str()); \ - if(__s1 != __s2) { \ - TEST_OK(#x" and "#y" not are equal."); \ - } else { \ - TEST_FAIL(#x" and "#y" are equal."); \ - } \ - } - -#define TEST_EQUAL_INT(x, y, fmt...) { \ - TEST_BASE(fmt); \ - int i1 = x; \ - int i2 = y; \ - fprintf(stderr, "Comparing: \"%d\" == \"%d\"\n", i1, i2); \ - if(i1 == i2) { \ - TEST_OK(#x" and "#y" are equal."); \ - } else { \ - TEST_FAIL(#x" and "#y" are not equal."); \ - } \ - } - -#define TEST_NOTEQUAL_INT(x, y, fmt...) { \ - TEST_BASE(fmt); \ - int i1 = x; \ - int i2 = y; \ - fprintf(stderr, "Comparing: \"%d\" != \"%d\"\n", i1, i2); \ - if(i1 != i2) { \ - TEST_OK(#x" and "#y" are not equal."); \ - } else { \ - TEST_FAIL(#x" and "#y" are equal."); \ - } \ - } - -#define TEST_EQUAL_FLOAT(x, y, fmt...) { \ - TEST_BASE(fmt); \ - double d1 = x; \ - double d2 = y; \ - fprintf(stderr, "Comparing: \"%f\" == \"%f\"\n", d1, d2); \ - if(d1 == d2) { \ - TEST_OK(#x" and "#y" are equal."); \ - } else { \ - TEST_FAIL(#x" and "#y" are not equal."); \ - } \ - } - -#define TEST_NOTEQUAL_FLOAT(x, y, fmt...) { \ - TEST_BASE(fmt); \ - double d1 = x; \ - double d2 = y; \ - fprintf(stderr, "Comparing: \"%f\" != \"%f\"\n", d1, d2); \ - if(d1 != d2) { \ - TEST_OK(#x" and "#y" are not equal."); \ - } else { \ - TEST_FAIL(#x" and "#y" are equal."); \ - } \ - } - -#define TEST_GREATER_THAN_INT(x, y, fmt...) { \ - TEST_BASE(fmt); \ - int i1 = x; \ - int i2 = y; \ - fprintf(stderr, "Comparing: \"%d\" > \"%d\"\n", i1, i2); \ - if(i1 > i2) { \ - TEST_OK(#x" are greater than "#y"."); \ - } else { \ - TEST_FAIL(#x" are not greater than "#y"."); \ - } \ - } - -#define TEST_LESS_THAN_INT(x, y, fmt...) { \ - TEST_BASE(fmt); \ - int i1 = x; \ - int i2 = y; \ - fprintf(stderr, "Comparing: \"%d\" < \"%d\"\n", i1, i2); \ - if(i1 < i2) { \ - TEST_OK(#x" are less than "#y"."); \ - } else { \ - TEST_FAIL(#x" are not less than "#y"."); \ - } \ - } - -#define TEST_GREATER_THAN_FLOAT(x, y, fmt...) { \ - TEST_BASE(fmt); \ - double d1 = x; \ - double d2 = y; \ - fprintf(stderr, "Comparing: \"%f\" > \"%f\"\n", d1, d2); \ - if(d1 > d2) { \ - TEST_OK(#x" are greater than "#y"."); \ - } else { \ - TEST_FAIL(#x" are not greater than "#y"."); \ - } \ - } - -#define TEST_LESS_THAN_FLOAT(x, y, fmt...) { \ - TEST_BASE(fmt); \ - double d1 = x; \ - double d2 = y; \ - fprintf(stderr, "Comparing: \"%f\" < \"%f\"\n", d1, d2); \ - if(d1 < d2) { \ - TEST_OK(#x" are less than "#y"."); \ - } else { \ - TEST_FAIL(#x" are not less than "#y"."); \ - } \ - } - -#define TEST_EXCEPTION(x, y, fmt...) { \ - TEST_BASE(fmt); \ - try { \ - x; \ - TEST_FAIL("Exception "#y" was not trown."); \ - } catch( y &e ) { \ - TEST_OK("Exception "#y" was thrown as expected."); \ - } \ - } - -#define TEST_NOTEXCEPTION(x, y, fmt...) { \ - TEST_BASE(fmt); \ - try { \ - x; \ - TEST_OK("Exception "#y" was not trown as expected"); \ - } catch( y &e ) { \ - TEST_FAIL("Exception "#y" was thrown."); \ - } \ - } - -#define TEST_NOEXCEPTION(x, fmt...) { \ - TEST_BASE(fmt); \ - try { \ - x; \ - TEST_OK("Exception was not trown as expected"); \ - } catch( ... ) { \ - TEST_FAIL("Exception was thrown."); \ - } \ - } - -#endif/*__PRACRO_TEST_H__*/ diff --git a/tools/testlist b/tools/testlist deleted file mode 100755 index 01a48e2..0000000 --- a/tools/testlist +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -SCRIPTDIR=`dirname $0` - -grep -l "TEST_BEGIN" *.cc > tmp - -echo -n "TESTFILES=" -while read LINE -do - FILE=$LINE - NAME=`echo $FILE | cut -d'.' -f1` - TEST=test_$NAME - echo -ne "$TEST " -done < tmp -echo "" -echo "" - -while read LINE -do - FILE=$LINE - 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@TEST_DEPS=\"$DEPS\" TEST_CFLAGS=\"$CFLAGS\" TEST_LIBS=\"$LIBS\" ${SCRIPTDIR}/test $FILE" - echo "" -done < tmp - -rm -f tmp \ No newline at end of file -- cgit v1.2.3