Skip to content

Commit 11e0e94

Browse files
sadyrovgouriano
authored andcommitted
Added SFTP requirements for apps. JIRA CXX-13855
git-svn-id: https://anonsvn.ncbi.nlm.nih.gov/repos/v1/trunk/c++@104393 78c7ea69-d796-4a43-9a09-de51944f1b03
1 parent 7312959 commit 11e0e94

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

src/connect/test/CMakeLists.test_ncbi_sftp.app.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
NCBI_begin_app(test_ncbi_sftp)
44
NCBI_sources(test_ncbi_sftp)
5-
NCBI_requires(Boost.Test.Included)
5+
NCBI_requires(Boost.Test.Included SSH Cxx2020_format_api)
66
NCBI_uses_toolkit_libraries(xconnsftp xconnect test_boost)
77
NCBI_project_watchers(sadyrovr)
88
NCBI_add_test()

src/connect/test/Makefile.test_ncbi_sftp.app

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CPPFLAGS = $(ORIG_CPPFLAGS) $(BOOST_INCLUDE)
88

99
LIBS = $(XCONNSFTP_LIBS) $(NETWORK_LIBS) $(ORIG_LIBS)
1010

11-
REQUIRES = Boost.Test.Included
11+
REQUIRES = Boost.Test.Included LIBSSH Cxx2020_format_api
1212

1313
WATCHERS = sadyrovr

src/connect/test/test_ncbi_sftp.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@
2828
*/
2929

3030
#include <ncbi_pch.hpp>
31-
#include <connect/ncbi_sftp.hpp>
32-
33-
#ifdef HAVE_SFTP
3431

3532
#include <common/test_data_path.h>
3633
#include <corelib/test_boost.hpp>
3734
#include <connect/ncbi_conn_stream.hpp>
35+
#include <connect/ncbi_sftp.hpp>
3836

3937
#include <optional>
4038
#include <unordered_set>
@@ -585,5 +583,3 @@ BOOST_AUTO_TEST_CASE(MLST)
585583
}
586584

587585
BOOST_AUTO_TEST_SUITE_END()
588-
589-
#endif

src/sample/app/sftp/CMakeLists.sftp_sample.app.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
NCBI_begin_app(sftp_sample)
44
NCBI_sources(sftp_sample)
5+
NCBI_requires(SSH Cxx2020_format_api)
56
NCBI_uses_toolkit_libraries(xconnsftp xconnect)
67
NCBI_project_watchers(sadyrovr)
78
NCBI_end_app()

src/sample/app/sftp/Makefile.sftp_sample.app

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ LIB = xconnsftp xconnect xutil xncbi
66

77
LIBS = $(XCONNSFTP_LIBS) $(NETWORK_LIBS) $(ORIG_LIBS)
88

9+
REQUIRES = LIBSSH Cxx2020_format_api
10+
911
WATCHERS = sadyrovr

0 commit comments

Comments
 (0)