grr

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3785 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am
index d68273739413fea5aed5ef75fc40f4249a692f48..e67337a255006b70cd06aeba65c8ea6e0f7c01d6 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am
+++ b/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am
@@ -93,9 +93,9 @@ EXTRA_DIST =          Doxyfile sip.docs sip_parser.docs sip.doxyaliases \
 # ----------------------------------------------------------------------
 # Tests
 
-TESTS = torture_sip run_test_sip_msg run_date_test
+#TESTS = torture_sip run_test_sip_msg run_date_test
 
-dist_noinst_SCRIPTS =  run_test_sip_msg run_date_test
+#dist_noinst_SCRIPTS =         run_test_sip_msg run_date_test
 
 # ----------------------------------------------------------------------
 # Sofia specific rules

diff --git a/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in b/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in
index 35f915fcea4db2b93de5926022877e221da23350..523c356ad6f4d876f2a8d264f6afc792c4052242 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in
+++ b/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in
@@ -25,7 +25,6 @@
 # ---------------------------------------------------
 
 
-
 SOURCES = $(libsip_la_SOURCES) date_test.c test_sip_msg.c torture_sip.c validator.c
 
 srcdir = @srcdir@
@@ -53,9 +52,8 @@ host_triplet = @host@
 target_triplet = @target@
 check_PROGRAMS = torture_sip$(EXEEXT) test_sip_msg$(EXEEXT) \
        validator$(EXEEXT) date_test$(EXEEXT)
-DIST_COMMON = $(dist_noinst_SCRIPTS) $(nobase_include_sofia_HEADERS) \
-       $(srcdir)/../sofia.am $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in ChangeLog
+DIST_COMMON = $(nobase_include_sofia_HEADERS) $(srcdir)/../sofia.am \
+       $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 subdir = libsofia-sip-ua/sip
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/sac-general.m4 \
@@ -97,7 +95,6 @@ validator_OBJECTS = validator.$(OBJEXT)
 validator_LDADD = $(LDADD)
 validator_DEPENDENCIES = libsip.la ../msg/libmsg.la ../bnf/libbnf.la \
        ../url/liburl.la ../su/libsu.la
-SCRIPTS = $(dist_noinst_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/libsofia-sip-ua/su/sofia-sip
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -348,11 +345,6 @@ EXTRA_DIST = Doxyfile sip.docs sip_parser.docs sip.doxyaliases \
        tests/test35.txt tests/test36.txt tests/test37.txt tests/test38.txt  \
        tests/test39.txt tests/test40.txt tests/test41.txt tests/test42.txt
 
-
-# ----------------------------------------------------------------------
-# Tests
-TESTS = torture_sip run_test_sip_msg run_date_test
-dist_noinst_SCRIPTS = run_test_sip_msg run_date_test
 AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) 
 DISTCLEANFILES = $(BUILT_SOURCES)
 
@@ -380,6 +372,13 @@ INTERNAL_INCLUDES = \
        -I$(srcdir)/../su -I../su
 
 
+# ----------------------------------------------------------------------
+# Tests
+
+#TESTS = torture_sip run_test_sip_msg run_date_test
+
+#dist_noinst_SCRIPTS =         run_test_sip_msg run_date_test
+
 # ----------------------------------------------------------------------
 # Sofia specific rules
 MSG_PARSER_AWK = $(srcdir)/../msg/msg_parser.awk
@@ -580,79 +579,6 @@ GTAGS:
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-       @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-       srcdir=$(srcdir); export srcdir; \
-       list='$(TESTS)'; \
-       if test -n "$$list"; then \
-         for tst in $$list; do \
-           if test -f ./$$tst; then dir=./; \
-           elif test -f $$tst; then dir=; \
-           else dir="$(srcdir)/"; fi; \
-           if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-             all=`expr $$all + 1`; \
-             case " $(XFAIL_TESTS) " in \
-             *" $$tst "*) \
-               xpass=`expr $$xpass + 1`; \
-               failed=`expr $$failed + 1`; \
-               echo "XPASS: $$tst"; \
-             ;; \
-             *) \
-               echo "PASS: $$tst"; \
-             ;; \
-             esac; \
-           elif test $$? -ne 77; then \
-             all=`expr $$all + 1`; \
-             case " $(XFAIL_TESTS) " in \
-             *" $$tst "*) \
-               xfail=`expr $$xfail + 1`; \
-               echo "XFAIL: $$tst"; \
-             ;; \
-             *) \
-               failed=`expr $$failed + 1`; \
-               echo "FAIL: $$tst"; \
-             ;; \
-             esac; \
-           else \
-             skip=`expr $$skip + 1`; \
-             echo "SKIP: $$tst"; \
-           fi; \
-         done; \
-         if test "$$failed" -eq 0; then \
-           if test "$$xfail" -eq 0; then \
-             banner="All $$all tests passed"; \
-           else \
-             banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-           fi; \
-         else \
-           if test "$$xpass" -eq 0; then \
-             banner="$$failed of $$all tests failed"; \
-           else \
-             banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-           fi; \
-         fi; \
-         dashes="$$banner"; \
-         skipped=""; \
-         if test "$$skip" -ne 0; then \
-           skipped="($$skip tests were not run)"; \
-           test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-             dashes="$$skipped"; \
-         fi; \
-         report=""; \
-         if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-           report="Please report to $(PACKAGE_BUGREPORT)"; \
-           test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-             dashes="$$report"; \
-         fi; \
-         dashes=`echo "$$dashes" | sed s/./=/g`; \
-         echo "$$dashes"; \
-         echo "$$banner"; \
-         test -z "$$skipped" || echo "$$skipped"; \
-         test -z "$$report" || echo "$$report"; \
-         echo "$$dashes"; \
-         test "$$failed" -eq 0; \
-       else :; fi
-
 distdir: $(DISTFILES)
        $(mkdir_p) $(distdir)/.. $(distdir)/images $(distdir)/sofia-sip $(distdir)/tests
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -683,10 +609,9 @@ distdir: $(DISTFILES)
        done
 check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-       $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
        for dir in "$(DESTDIR)$(include_sofiadir)"; do \
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
@@ -770,7 +695,7 @@ ps-am:
 
 uninstall-am: uninstall-info-am uninstall-nobase_include_sofiaHEADERS
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
        clean-checkPROGRAMS clean-generic clean-libtool \
        clean-noinstLTLIBRARIES ctags distclean distclean-compile \
        distclean-generic distclean-libtool distclean-tags distdir dvi \