From 3ba41d0f74a62bed0adcb6ffc51b8f8a57210b73 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 16 May 2013 08:07:07 +0200 Subject: Remove test framework. TODO: Replace it with a new one at some point... --- Makefile.am | 2 - autogen.sh | 23 ---- drumgizmo/Makefile.am | 11 -- src/Makefile.am | 11 -- tools/Makefile.am.test | 14 --- tools/test | 39 ------- tools/test.h | 286 ------------------------------------------------- tools/testlist | 31 ------ 8 files changed, 417 deletions(-) delete mode 100644 tools/Makefile.am.test delete mode 100755 tools/test delete mode 100644 tools/test.h delete mode 100755 tools/testlist diff --git a/Makefile.am b/Makefile.am index ba50ccc..e42552e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,5 +11,3 @@ EXTRA_DIST = \ hugin/hugin_syslog.h \ hugin/hugin_syslog.c -test: - $(MAKE) -C src test diff --git a/autogen.sh b/autogen.sh index a1557f4..45ef969 100755 --- a/autogen.sh +++ b/autogen.sh @@ -51,21 +51,6 @@ if [ "$DIE" -eq 1 ]; then exit 1 fi -# Create testfiles -TESTDIRS="src plugingui drumgizmo lv2" -echo "Creating unittest Makefiles:" -for d in $TESTDIRS -do - echo "Checking $d" - if [ ! -f $d/Makefile.am.test ] - then - echo " didn't find it, touching." - touch $d/Makefile.am.test - else - echo " found it." - fi -done - aclocalinclude="$ACLOCAL_FLAGS"; \ (echo $_echo_n " + Running aclocal: $_echo_c"; \ aclocal $aclocalinclude; \ @@ -84,11 +69,3 @@ aclocalinclude="$ACLOCAL_FLAGS"; \ echo "done.") rm -f config.cache - -for d in $TESTDIRS -do - if [ -f $d/Makefile.am.test ] - then - rm $d/Makefile.am.test - fi -done \ No newline at end of file diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am index f1041ff..d1c51ae 100644 --- a/drumgizmo/Makefile.am +++ b/drumgizmo/Makefile.am @@ -25,15 +25,4 @@ EXTRA_DIST = \ audioinputenginedl.h \ audiooutputenginedl.h -################ -# Test Section # -################ - -TEST_SOURCE_DEPS = ${drumgizmo_SOURCES} ${EXTRA_DIST} -TEST_SCRIPT_DIR = $(top_srcdir)/tools - -include ${TEST_SCRIPT_DIR}/Makefile.am.test - -include Makefile.am.test - endif \ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index 76288ff..35d052b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,14 +51,3 @@ EXTRA_DIST = \ semaphore.cc \ thread.cc \ velocity.cc - -################ -# Test Section # -################ - -TEST_SOURCE_DEPS = ${EXTRA_DIST} -TEST_SCRIPT_DIR = $(top_srcdir)/tools - -include ${TEST_SCRIPT_DIR}/Makefile.am.test - -include Makefile.am.test diff --git a/tools/Makefile.am.test b/tools/Makefile.am.test deleted file mode 100644 index 5c5e8c7..0000000 --- a/tools/Makefile.am.test +++ /dev/null @@ -1,14 +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 -f $(TESTFILES) $(TESTLOGS) - -TESTLOGS = `for F in ${TESTFILES}; do echo $$F.log; done` - -CLEANFILES = $(TESTFILES) $(TESTLOGS) Makefile.am.test *~ - diff --git a/tools/test b/tools/test deleted file mode 100755 index 84dd8c0..0000000 --- a/tools/test +++ /dev/null @@ -1,39 +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` - -COMPILE="g++ -DHAVE_CONFIG_H -I$SCRIPTDIR -g -Wall -Werror -D$DEFINE -o $OUTPUT $*" - -echo -e "\033[0;2mTesting $TEST:" -echo Testing $TEST: > $OUTPUT.log - -echo -n "* Compiling $TEST test" -echo Compiling $TEST test: > $OUTPUT.log -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 -# gdb ./$OUTPUT --eval-command=run - 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 c6ad38e..0000000 --- a/tools/test.h +++ /dev/null @@ -1,286 +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_PTR(x, y, fmt...) { \ - TEST_BASE(fmt); \ - void *i1 = x; \ - void *i2 = y; \ - fprintf(stderr, "Comparing: \"%p\" == \"%p\"\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_PTR(x, y, fmt...) { \ - TEST_BASE(fmt); \ - void *i1 = x; \ - void *i2 = y; \ - fprintf(stderr, "Comparing: \"%p\" != \"%p\"\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: \"%.64f\" == \"%.64f\"\n", d1, d2); \ - if(d1 >= d2 && 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: \"%.64f\" != \"%.64f\"\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: \"%.64f\" > \"%.64f\"\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: \"%.64f\" < \"%.64f\"\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 c42824f..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@${SCRIPTDIR}/test $FILE $DEPS $CFLAGS $LIBS" - echo "" -done < tmp - -rm -f tmp \ No newline at end of file -- cgit v1.2.3 From 7d71222297b1b7ebe8ecae1e21a7c2612185ed39 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 16 May 2013 08:08:03 +0200 Subject: Remove test framework. TODO: Replace it with a new one at some point... --- plugingui/Makefile.am | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index e705b3b..aee2de6 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -51,14 +51,3 @@ EXTRA_DIST = \ verticalline.h \ widget.h \ window.h - -################ -# Test Section # -################ - -TEST_SOURCE_DEPS = ${EXTRA_DIST} -TEST_SCRIPT_DIR = $(top_srcdir)/tools - -include ${TEST_SCRIPT_DIR}/Makefile.am.test - -include Makefile.am.test -- cgit v1.2.3 From 1dcb87f400b36f773942562db901e134d14ef8ed Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 16 May 2013 10:43:56 +0200 Subject: Fix lineedit mouseclick to the right of the text, which should position text cursor to the right of the text. --- plugingui/lineedit.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/plugingui/lineedit.cc b/plugingui/lineedit.cc index 9308902..16c6dda 100644 --- a/plugingui/lineedit.cc +++ b/plugingui/lineedit.cc @@ -94,6 +94,7 @@ void GUI::LineEdit::buttonEvent(ButtonEvent *e) break; } } + if(e->x >= (int)(font.textWidth(_text) + BORDER)) pos = _text.length(); repaintEvent(NULL); } } -- cgit v1.2.3