[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 785e186 3/3: Merge commit 'ec7ba4f2dbae0901724483de5868127
|
From: |
Rocky Bernstein |
|
Subject: |
[elpa] master 785e186 3/3: Merge commit 'ec7ba4f2dbae0901724483de5868127a1cbc38e9' |
|
Date: |
Mon, 16 Feb 2015 04:04:28 +0000 |
branch: master
commit 785e186ee6f4a2890e86fdf4e42d8082196e58d5
Merge: 033b7ff ec7ba4f
Author: rocky <address@hidden>
Commit: rocky <address@hidden>
Merge commit 'ec7ba4f2dbae0901724483de5868127a1cbc38e9'
---
packages/test-simple/Makefile.am | 20 +++++++++++++++++++-
packages/test-simple/example/gcd.el | 25 +++++++++++++++++++++++--
packages/test-simple/example/test-gcd.el | 25 +++++++++++++++++++++++--
packages/test-simple/test-simple.el | 8 +++-----
packages/test-simple/test/test-basic.el | 21 +++++++++++++++++++++
packages/test-simple/test/test-fns.el | 21 +++++++++++++++++++++
packages/test-simple/test/test-no-clear.el | 21 +++++++++++++++++++++
7 files changed, 131 insertions(+), 10 deletions(-)
diff --git a/packages/test-simple/Makefile.am b/packages/test-simple/Makefile.am
index 524deb2..a1c318c 100644
--- a/packages/test-simple/Makefile.am
+++ b/packages/test-simple/Makefile.am
@@ -20,7 +20,7 @@ check: $(test-files)
README: README.textile
ln -s README.md README
-PHONY=check clean dist distclean test check-short check-terse install-short
+PHONY=check check_copyrights clean dist distclean test check-short check-terse
install-short
if MAINTAINER_MODE
@@ -44,3 +44,21 @@ check-terse:
#: Run "make install"
install-short:
$(MAKE) install 2>&1 | $(RUBY) make-check-filter.rb
+
+CR_EXCEPTIONS=copyright_exceptions
+#: Check for GNU Copyrights.
+check_copyrights:
+ @echo "Compute exceptions >$(CR_EXCEPTIONS)~"
+ @export LANG=C; \
+ find . -name '.git' -prune -o -name '*.el' -print0 | \
+ xargs -0 grep -L 'Free Software Foundation, Inc' | \
+ grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$$'; \
+ find . -name '.git' -prune -o -name '*.el' -print | \
+ while read f; do \
+ fquoted="$$(echo $$f|tr '|' '_')"; \
+ sed -n -e '/[Cc]opyright.*, *[1-9][-0-9]*,\?$$/N' \
+ -e '/Free Software Foundation/d' \
+ -e "s|^\\(.*[Cc]opyright\\)|$$fquoted:\\1|p" \
+ "$$f"; \
+ done | sort >$(CR_EXCEPTIONS)~
+ diff -u "$(CR_EXCEPTIONS)" "$(CR_EXCEPTIONS)~"
diff --git a/packages/test-simple/copyright_exceptions
b/packages/test-simple/copyright_exceptions
new file mode 100644
index 0000000..e69de29
diff --git a/packages/test-simple/example/gcd.el
b/packages/test-simple/example/gcd.el
index 9a1ac20..ed587be 100644
--- a/packages/test-simple/example/gcd.el
+++ b/packages/test-simple/example/gcd.el
@@ -1,11 +1,32 @@
+;;; test-simple.el --- Simple Unit Test Framework for Emacs Lisp
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+;; URL: http://github.com/rocky/emacs-test-simple
+;; Keywords: unit-test
+;; Version: 1.0
+
+;; 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 the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+
+;; This program 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 this program. If not, see
+;; <http://www.gnu.org/licenses/>.
(defun gcd(a b)
"Greatest Common Divisor of A and B"
;; Make a < b
- (if (> a b)
+ (if (> a b)
(let ((c a))
(setq a b)
(setq b c)))
- (cond
+ (cond
((< a 0) nil)
((or (= 0 (- b a)) (= a 1)) a)
(t (gcd (- b a) a))
diff --git a/packages/test-simple/example/test-gcd.el
b/packages/test-simple/example/test-gcd.el
index ce4ccae..8ffdce8 100644
--- a/packages/test-simple/example/test-gcd.el
+++ b/packages/test-simple/example/test-gcd.el
@@ -1,8 +1,29 @@
+;;; test-simple.el --- Simple Unit Test Framework for Emacs Lisp
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+;; URL: http://github.com/rocky/emacs-test-simple
+;; Keywords: unit-test
+;; Version: 1.0
+
+;; 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 the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+
+;; This program 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 this program. If not, see
+;; <http://www.gnu.org/licenses/>.
(require 'test-simple)
(test-simple-start)
-(assert-t (load-file "./gcd.el")
+(assert-t (load-file "./gcd.el")
"Can't load gcd.el - are you in the right directory?" )
(note "degenereate cases")
@@ -14,7 +35,7 @@
(assert-equal 1 (gcd 3 5) "gcd(3,5)")
(assert-equal 8 (gcd 8 32) "gcd(8,32)")
-(assert-raises error (gcd "a" 32)
+(assert-raises error (gcd "a" 32)
"Passing a string value should raise an error")
(end-tests)
diff --git a/packages/test-simple/test-simple.el
b/packages/test-simple/test-simple.el
index dde4bad..351a60b 100644
--- a/packages/test-simple/test-simple.el
+++ b/packages/test-simple/test-simple.el
@@ -1,14 +1,12 @@
;;; test-simple.el --- Simple Unit Test Framework for Emacs Lisp
;; Rewritten from Phil Hagelberg's behave.el by rocky
-;; Copyright (C) 2010, 2012-2013, 2014 Rocky Bernstein
+;; Copyright (C) 2015 Free Software Foundation, Inc
-;; Author: Rocky Bernstein
+;; Author: Rocky Bernstein <address@hidden>
;; URL: http://github.com/rocky/emacs-test-simple
;; Keywords: unit-test
-;; Version: 1.0
-
-;; This file is NOT part of GNU Emacs.
+;; Version: 1.1
;; This program is free software: you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
diff --git a/packages/test-simple/test/test-basic.el
b/packages/test-simple/test/test-basic.el
index 72cb5b3..2751826 100644
--- a/packages/test-simple/test/test-basic.el
+++ b/packages/test-simple/test/test-basic.el
@@ -1,3 +1,24 @@
+;;; test-simple.el --- Simple Unit Test Framework for Emacs Lisp
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+;; URL: http://github.com/rocky/emacs-test-simple
+;; Keywords: unit-test
+;; Version: 1.0
+
+;; 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 the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+
+;; This program 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 this program. If not, see
+;; <http://www.gnu.org/licenses/>.
(require 'cl)
(load-file "../test-simple.el")
(test-simple-start "test-simple.el")
diff --git a/packages/test-simple/test/test-fns.el
b/packages/test-simple/test/test-fns.el
index c690289..be36d4a 100644
--- a/packages/test-simple/test/test-fns.el
+++ b/packages/test-simple/test/test-fns.el
@@ -1,3 +1,24 @@
+;;; test-simple.el --- Simple Unit Test Framework for Emacs Lisp
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+;; URL: http://github.com/rocky/emacs-test-simple
+;; Keywords: unit-test
+;; Version: 1.0
+
+;; 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 the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+
+;; This program 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 this program. If not, see
+;; <http://www.gnu.org/licenses/>.
(require 'cl)
(load-file "../test-simple.el")
(test-simple-clear)
diff --git a/packages/test-simple/test/test-no-clear.el
b/packages/test-simple/test/test-no-clear.el
index 5ac81a4..34bbbe7 100644
--- a/packages/test-simple/test/test-no-clear.el
+++ b/packages/test-simple/test/test-no-clear.el
@@ -1,3 +1,24 @@
+;;; test-simple.el --- Simple Unit Test Framework for Emacs Lisp
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+;; URL: http://github.com/rocky/emacs-test-simple
+;; Keywords: unit-test
+;; Version: 1.0
+
+;; 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 the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+
+;; This program 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 this program. If not, see
+;; <http://www.gnu.org/licenses/>.
(require 'cl)
(load-file "../test-simple.el")
;; We don't do this or test-simple-start