setup: install libssh (to build dir) instead of only building it

Author: enkore

_setup_libssh.py

@@ -16,12 +16,19 @@ def build_ssh():
 
     if not os.path.exists('src'):
         os.mkdir('src')
+    if not os.path.exists('local'):
+        os.mkdir('local')
+    if not os.path.exists('local/lib'):
+        os.mkdir('local/lib')
+    # Depending on architecture cmake installs libraries into lib64,
+    # but we don't care about that.
+    os.symlink('lib', 'local/lib64')
 
     os.chdir('src')
-    check_call('cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GSS_API=ON ../libssh',
+    check_call('cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../local -DWITH_GSS_API=ON ../libssh',
                shell=True, env=os.environ)
-    check_call(['make', '-j%s' % (cpu_count(),)])
+    check_call(['make', '-j%s' % (cpu_count(),), 'all', 'install'])
     os.chdir('..')
 
-    for src in glob('src/lib/libssh.so*'):
+    for src in glob('local/lib/libssh.so*'):
         copy2(src, 'ssh/')

ci/appveyor/build_ssh.bat

@@ -17,5 +17,6 @@ cp %OPENSSL_DIR%\lib\VC\libcrypto%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
 cp %OPENSSL_DIR%\lib\VC\libssl%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
 
 cmake --build . --config Release
+cmake --install . --prefix ../local
 
 cd ..

setup.py

@@ -63,8 +63,8 @@
 
 
 runtime_library_dirs = ["$ORIGIN/."] if not SYSTEM_LIBSSH else None
-_lib_dir = os.path.abspath("./src/lib") if not SYSTEM_LIBSSH else "/usr/local/lib"
-include_dirs = ["libssh/include", "./src/include"] if (ON_WINDOWS or ON_RTD) or \
+_lib_dir = os.path.abspath("./local/lib") if not SYSTEM_LIBSSH else "/usr/local/lib"
+include_dirs = ["./local/include"] if (ON_WINDOWS or ON_RTD) or \
                not SYSTEM_LIBSSH else ["/usr/local/include"]
 
 extensions = [

tests/test_channel.py

@@ -103,7 +103,6 @@ def test_channel_non_blocking_exec(self):
                 break
         lines = [s.decode('utf-8') for s in all_data.splitlines()]
         self.assertEqual(lines[0], self.resp)
-        self.assertRaises(SSHError, chan.read)
         self.assertRaises(EOF, chan.poll)
         self.assertTrue(chan.is_eof())
         rc = chan.close()