Skip to content

Commit

Permalink
cleanup core/src/tests directory
Browse files Browse the repository at this point in the history
 - moved "testls" to tools and renamed to "btestls"
   adapted all regression tests using testls

 - remove other core/src/tests binaries
   and replaced them with standard tools
  • Loading branch information
pstorz committed Sep 14, 2018
1 parent fca1a94 commit c35780b
Show file tree
Hide file tree
Showing 18 changed files with 20 additions and 1,868 deletions.
5 changes: 1 addition & 4 deletions core/platforms/packaging/bareos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -1351,10 +1351,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
%{script_dir}/bareos-ctl-*
%{_bindir}/timelimit
%{_sbindir}/timelimit
%{_sbindir}/bbatch
%{_sbindir}/bregtest
%{_sbindir}/grow
%{_sbindir}/testls
%{_sbindir}/btestls
# must be readable by package build user of bareos-regress.
%attr(0644, %{daemon_user}, %{daemon_group}) %config(noreplace) %{_sysconfdir}/%{name}/bareos-regress.conf

Expand Down
31 changes: 0 additions & 31 deletions core/src/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,3 @@
# 02110-1301, USA.


add_executable(bregtest bregtest.cc )
target_link_libraries(bregtest bareos ${JANSSON_LIBRARIES})

add_executable(testls testls.cc)
target_link_libraries(testls bareosfind bareos ${JANSSON_LIBRARIES})

IF(NOT HAVE_WIN32)
add_executable(bbatch bbatch.cc)
target_link_libraries(bbatch bareoscats bareossql bareos ${JANSSON_LIBRARIES})
ENDIF()

#add_executable(bvfs_test bvfs_test.cc)
#target_link_libraries(bvfs_test bareoscats bareossql)

#add_executable(cats_test cats_test.cc)
#target_link_libraries(cats_test bareoscats bareossql)

add_executable(gigaslam gigaslam.cc)
target_link_libraries(gigaslam)

add_executable(grow grow.cc)
target_link_libraries(grow bareos ${JANSSON_LIBRARIES})

set (TESTS_SBIN
bregtest grow testls
)
IF(NOT HAVE_WIN32)
LIST(APPEND TESTS_SBIN bbatch)
ENDIF()

INSTALL(TARGETS ${TESTS_SBIN} DESTINATION "${sbindir}")
Loading

0 comments on commit c35780b

Please sign in to comment.