]> code.delx.au - gnu-emacs/commitdiff
Allow network-stream-tests to work for out-of-tree builds
authorKen Brown <kbrown@cornell.edu>
Tue, 24 May 2016 20:12:03 +0000 (16:12 -0400)
committerKen Brown <kbrown@cornell.edu>
Tue, 24 May 2016 20:12:03 +0000 (16:12 -0400)
* test/lisp/net/network-stream-tests.el
(network-stream-tests--datadir): New defconst.
(make-tls-server): Use it.

test/lisp/net/network-stream-tests.el

index f30c92a1de5b3c18e96232cee6c6dcc84d406f52..9e21420dbbc384a3f93a974799518377421046eb 100644 (file)
       (should (equal (buffer-string) "foo\n")))
     (delete-process server)))
 
+(defconst network-stream-tests--datadir
+  (expand-file-name "test/data/net" source-directory))
+
 (defun make-tls-server (port)
   (start-process "gnutls" (generate-new-buffer "*tls*")
                  "gnutls-serv" "--http"
-                 "--x509keyfile" "data/net/key.pem"
-                 "--x509certfile" "data/net/cert.pem"
+                 "--x509keyfile"
+                 (concat network-stream-tests--datadir "/key.pem")
+                 "--x509certfile"
+                 (concat network-stream-tests--datadir "/cert.pem")
                  "--port" (format "%s" port)))
 
 (ert-deftest connect-to-tls-ipv4-wait ()