From b183f2635eaf323066f26c7ca22d931d4f4ccd3a Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Fri, 6 May 2016 18:41:57 +0300 Subject: [PATCH] test: copyright information updates Files in test directories had only copyright of a single individual, of which code was adapted here as a base of the test system. Since then many Notmuch Developers have contributed to the test system, which is now acknowledged with a constant string in some of the test files. The README file in test directory instructed new files contain a copyright notice, but that has never been done (and it is also not needed). To simplify things a bit (and lessen confusion) this instruction is now removed. As a side enchangement, all of the 3 entries in the whole source tree cd'ing to `dirname` of "$0" now uses syntax cd "$(dirname "$0")". This makes these particular lines work when current working directory is e.g. /c/Program Files/notmuch/test/. (Probably it would fail elsewhere, though.) --- performance-test/notmuch-memory-test | 3 ++- performance-test/notmuch-time-test | 3 ++- test/README | 6 +----- test/notmuch-test | 3 ++- test/test-lib-common.sh | 1 + test/test-lib.sh | 1 + 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/performance-test/notmuch-memory-test b/performance-test/notmuch-memory-test index 3cf28c7f..047aac70 100755 --- a/performance-test/notmuch-memory-test +++ b/performance-test/notmuch-memory-test @@ -3,6 +3,7 @@ # Run tests # # Copyright (c) 2005 Junio C Hamano +# Copyright (c) 2010 Notmuch Developers # # Adapted from a Makefile to a shell script by Carl Worth (2010) @@ -14,7 +15,7 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then exit 1 fi -cd $(dirname "$0") +cd "$(dirname "$0")" for test in M*.sh; do ./"$test" "$@" diff --git a/performance-test/notmuch-time-test b/performance-test/notmuch-time-test index 7113efbf..4dd21fe1 100755 --- a/performance-test/notmuch-time-test +++ b/performance-test/notmuch-time-test @@ -3,6 +3,7 @@ # Run tests # # Copyright (c) 2005 Junio C Hamano +# Copyright (c) 2010 Notmuch Developers # # Adapted from a Makefile to a shell script by Carl Worth (2010) @@ -14,7 +15,7 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then exit 1 fi -cd $(dirname "$0") +cd "$(dirname "$0")" for test in T*.sh; do ./"$test" "$@" diff --git a/test/README b/test/README index bd9ab547..104a120e 100644 --- a/test/README +++ b/test/README @@ -145,13 +145,9 @@ Tddd-testname.sh where 'ddd' is three digits and 'testname' the "bare" name of your test. Tests will be run in order the 'ddd' part determines. The test script should start with the standard "#!/usr/bin/env bash" -with copyright notices, and an assignment to variable 'test_description', -like this: +and an assignment to variable 'test_description', like this: #!/usr/bin/env bash - # - # Copyright (c) 2005 Junio C Hamano - # test_description='xxx test (option --frotz) diff --git a/test/notmuch-test b/test/notmuch-test index b8437127..988dce6c 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -3,6 +3,7 @@ # Run tests # # Copyright (c) 2005 Junio C Hamano +# Copyright (c) 2010 Notmuch Developers # # Adapted from a Makefile to a shell script by Carl Worth (2010) @@ -14,7 +15,7 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then exit 1 fi -cd $(dirname "$0") +cd "$(dirname "$0")" TESTS=${NOTMUCH_TESTS:-`echo T[0-9][0-9][0-9]-*.sh`} diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh index 4e17b781..ba4a8e11 100644 --- a/test/test-lib-common.sh +++ b/test/test-lib-common.sh @@ -1,5 +1,6 @@ # # Copyright (c) 2005 Junio C Hamano +# Copyright (c) 2010 Notmuch Developers # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/test-lib.sh b/test/test-lib.sh index 09f87319..62e123d6 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -1,5 +1,6 @@ # # Copyright (c) 2005 Junio C Hamano +# Copyright (c) 2010 Notmuch Developers # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by