summaryrefslogtreecommitdiff
path: root/test/lisp/net/network-stream-tests.el
diff options
context:
space:
mode:
authorKen Brown <kbrown@cornell.edu>2016-05-24 16:12:03 -0400
committerKen Brown <kbrown@cornell.edu>2016-05-24 16:12:03 -0400
commit1ee91bf89176251f6e399c8436dca0248cdd6f6b (patch)
treeaec2aa7ac7f1c80ed5ac62b7fd341606ad159e71 /test/lisp/net/network-stream-tests.el
parent6a28fa85a106cad64fdc157b375c9b448785fb31 (diff)
downloademacs-1ee91bf89176251f6e399c8436dca0248cdd6f6b.tar.gz
emacs-1ee91bf89176251f6e399c8436dca0248cdd6f6b.tar.bz2
emacs-1ee91bf89176251f6e399c8436dca0248cdd6f6b.zip
Allow network-stream-tests to work for out-of-tree builds
* test/lisp/net/network-stream-tests.el (network-stream-tests--datadir): New defconst. (make-tls-server): Use it.
Diffstat (limited to 'test/lisp/net/network-stream-tests.el')
-rw-r--r--test/lisp/net/network-stream-tests.el9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
index f30c92a1de5..9e21420dbbc 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -156,11 +156,16 @@
(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 ()