[elpa] externals/assess 3d659897df 03/95: Require cl-lib, local emacs test override.

[ELPA Syncer]

branch: externals/assess
commit 3d659897df7d2c0f3428ac4d372650b604560bfa
Author: Phillip Lord <phillip.lord@newcastle.ac.uk>
Commit: Phillip Lord <phillip.lord@newcastle.ac.uk>

    Require cl-lib, local emacs test override.
    
    cl-lib needs to be required for cl-cadar to work. I also need the
    ability to force Emacs version locally, as we use nadvice which is
    Emacs 24.4 earliest.
---
 .gitignore            | 1 +
 Makefile              | 5 +++++
 test/sisyphus-test.el | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 70590b848b..298469056b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /.cask
 /sisyphus.org
+/makefile-local
diff --git a/Makefile b/Makefile
index 6d34bef733..0cae82698e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,14 @@
 EMACS ?= emacs
 CASK ?= cask
 
+include makefile-local
+
+export EMACS
+
 all: install test
 
 install:
+       echo EMACS is $(EMACS)
        cask install
 
 just-test:
diff --git a/test/sisyphus-test.el b/test/sisyphus-test.el
index a68d3f6b8d..d7967b78f5 100644
--- a/test/sisyphus-test.el
+++ b/test/sisyphus-test.el
@@ -16,9 +16,10 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (require 'sisyphus)
+(require 'cl-lib)
 
 (defun sisyphus-test--plist-from-test (result)
-  (cdadr
+  (cl-cdadr
    (ert-test-result-with-condition-condition result)))
 
 (ert-deftest plist-extraction ()