Ticket 2570: Code cleanup

Moved tests from lib/tests to tests/lib directory Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-07-11 11:22:46 +03:00 · 2011-07-11 11:22:46 +03:00 · d3bb9de01f
--- a/Makefile.am
+++ b/Makefile.am
@ -3,6 +3,10 @@ AUTOMAKE_OPTIONS = 1.5

 SUBDIRS = intl po lib src doc contrib misc

+if HAVE_TESTS
+    SUBDIRS += tests
+endif
+
 EXTRA_DIST = 

 dist_noinst_SCRIPTS = build-glib2.sh
--- a/configure.ac
+++ b/configure.ac
@ -596,10 +596,11 @@ po/Makefile.in

 if test x$enable_tests != xno; then
    AC_CONFIG_FILES([
-lib/tests/Makefile
-lib/tests/mcconfig/Makefile
-lib/tests/search/Makefile
-lib/tests/vfs/Makefile
+tests/Makefile
+tests/lib/Makefile
+tests/lib/mcconfig/Makefile
+tests/lib/search/Makefile
+tests/lib/vfs/Makefile
 ])

 fi
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -1,9 +1,5 @@
 SUBDIRS = event filehighlight mcconfig search skin tty vfs strutil widget .

-if HAVE_TESTS
-    SUBDIRS += tests
-endif
-
 if ENABLE_MCLIB
    LIB_VERSION=`echo $(LIBMC_VERSION) | \
 	tr '.' ' '| \
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -0,0 +1 @@
+SUBDIRS = lib
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
--- a/tests/lib/library_independ.c
+++ b/tests/lib/library_independ.c
--- a/tests/lib/mc_build_filename.c
+++ b/tests/lib/mc_build_filename.c
--- a/tests/lib/mcconfig/Makefile.am
+++ b/tests/lib/mcconfig/Makefile.am
--- a/tests/lib/mcconfig/config_string.c
+++ b/tests/lib/mcconfig/config_string.c
--- a/tests/lib/search/Makefile.am
+++ b/tests/lib/search/Makefile.am
--- a/tests/lib/search/regex_process_escape_sequence.c
+++ b/tests/lib/search/regex_process_escape_sequence.c
--- a/tests/lib/search/regex_replace_esc_seq.c
+++ b/tests/lib/search/regex_replace_esc_seq.c
--- a/tests/lib/serialize.c
+++ b/tests/lib/serialize.c
--- a/tests/lib/vfs/Makefile.am
+++ b/tests/lib/vfs/Makefile.am
--- a/tests/lib/vfs/canonicalize_pathname.c
+++ b/tests/lib/vfs/canonicalize_pathname.c
--- a/tests/lib/vfs/current_dir.c
+++ b/tests/lib/vfs/current_dir.c
--- a/tests/lib/vfs/mc.charsets
+++ b/tests/lib/vfs/mc.charsets
--- a/tests/lib/vfs/path_serialize.c
+++ b/tests/lib/vfs/path_serialize.c
--- a/tests/lib/vfs/vfs_parse_ls_lga.c
+++ b/tests/lib/vfs/vfs_parse_ls_lga.c
--- a/tests/lib/vfs/vfs_path_string_convert.c
+++ b/tests/lib/vfs/vfs_path_string_convert.c
--- a/tests/lib/vfs/vfs_prefix_to_class.c
+++ b/tests/lib/vfs/vfs_prefix_to_class.c
--- a/tests/lib/vfs/vfs_s_get_path.c
+++ b/tests/lib/vfs/vfs_s_get_path.c
--- a/tests/lib/vfs/vfs_split.c
+++ b/tests/lib/vfs/vfs_split.c
--- a/tests/lib/x_basename.c
+++ b/tests/lib/x_basename.c