Author: anthm Date: Thu Dec 21 15:42:43 2006 New Revision: 3785 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in Log: grr Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am Thu Dec 21 15:42:43 2006 @@ -93,9 +93,9 @@ # ---------------------------------------------------------------------- # 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 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.in Thu Dec 21 15:42:43 2006 @@ -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 @@ 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_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 @@ 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) @@ -381,6 +373,13 @@ # ---------------------------------------------------------------------- +# 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 AWK_SIP_AWK = $(AWK) -f $(MSG_PARSER_AWK) module=sip @@ -580,79 +579,6 @@ 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 @@ 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 @@ 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 \