From b590ec28c862c4ed9c057f9d52ec28ac010a23da Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Mon, 27 Mar 2017 11:02:25 -0400
Subject: [PATCH] Trivial build fixes

Correctly point ASDF to the tests. Cleanup asd files.

Parameter-error was undefined, use plain error instead.

NB: The scp roundtrip test still fails for me :-(
---
 libssh2.asd      | 27 ++++++++++++---------------
 libssh2.test.asd | 14 +++++---------
 src/util.lisp    |  2 +-
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/libssh2.asd b/libssh2.asd
index 6f8d7a0..613554b 100644
--- a/libssh2.asd
+++ b/libssh2.asd
@@ -1,32 +1,29 @@
 ;;; -*- mode: Lisp; syntax: Common-Lisp; -*-
 
-(in-package :asdf)
-
-(cl:eval-when (:load-toplevel :execute)
-  (asdf:operate 'asdf:load-op 'cffi-grovel))
-
-(defsystem :libssh2
+(defsystem "libssh2"
   :description "Trivial libssh2 bindings"
   :version      "0.1"
   :author       "Oleksii Shevchuk <alxchk@gmail.com>"
   :license      "Public Domain"
-  :depends-on   (:babel
-                 :cffi
-                 :cl-fad
-                 :hu.dwim.logger
-                 :split-sequence
-                 :trivial-gray-streams
-                 :usocket)
+  :defsystem-depends-on ("cffi-grovel")
+  :depends-on   ("babel"
+                 "cffi"
+                 "cl-fad"
+                 "hu.dwim.logger"
+                 "split-sequence"
+                 "trivial-gray-streams"
+                 "usocket")
   :serial       t
   :components   ((:module "src"
                   :serial t
                   :components ((:file "package")
                                (:file "logging")
                                (:file "types")
-                               (cffi-grovel:grovel-file "libssh2-libc-cffi")
+                               (:cffi-grovel-file "libssh2-libc-cffi")
                                (:file "util")
                                (:file "libssh2-cffi")
                                (:file "streams")
                                (:file "scp")
                                (:file "sftp")
-                               (:file "solutions")))))
+                               (:file "solutions"))))
+  :in-order-to ((test-op (test-op "libssh2.test"))))
diff --git a/libssh2.test.asd b/libssh2.test.asd
index d4d27be..37535a5 100644
--- a/libssh2.test.asd
+++ b/libssh2.test.asd
@@ -1,19 +1,15 @@
 ;;; -*- mode: lisp; syntax: common-lisp; indent-tabs-mode: nil -*-
 
-(in-package :asdf)
-
-(defsystem :libssh2.test
+(defsystem "libssh2.test"
   :description "cl-libssh2 tests"
   :author       "Oleksii Shevchuk <alxchk@gmail.com>"
   :license      "Public Domain"
-  :depends-on   (#:libssh2
-                 #:hu.dwim.stefil)
+  :depends-on   ("libssh2"
+                 "hu.dwim.stefil")
   :serial       t
   :components   ((:module "test"
                   :components
                   ((:file "package")
                    (:file "scp")
-                   (:file "sftp")))))
-
-(defmethod perform ((o test-op) (c (eql (find-system :libssh2.test))))
-  (funcall (intern (string '#:run-unit-tests) '#:libssh2.test)))
+                   (:file "sftp"))))
+  :perform (test-op (o c) (symbol-call :libssh2.test :run-all-tests)))
diff --git a/src/util.lisp b/src/util.lisp
index 5416d0f..623131a 100644
--- a/src/util.lisp
+++ b/src/util.lisp
@@ -18,7 +18,7 @@ set."
   ;; add other Lisps here if necessary
   #+(or :sbcl :cmu)
   (unless (eql read-timeout write-timeout)
-    (parameter-error "Read and write timeouts for socket must be equal."))
+    (error "Read and write timeouts for socket must be equal."))
   #+:clisp
   (when read-timeout
     (socket:socket-options (usocket:socket usocket) :SO-RCVTIMEO read-timeout))