You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2014/04/04 12:52:52 UTC
svn commit: r1584612 - in /tcl/rivet/trunk: ChangeLog Makefile.in
src/rivetcmds/rivetCore.c tests/checkfails.tcl tests/failtest.tcl
tests/failtest.test tests/rivet.test
Author: mxmanghi
Date: Fri Apr 4 10:52:52 2014
New Revision: 1584612
URL: http://svn.apache.org/r1584612
Log:
* tests/failtest.tcl,failtest.test,checkfail.tcl: adding script for commands that must fail
outside of a request processing (to be completed)
* src/rivetcmds/rivetCore.c: comment rephrased
Added:
tcl/rivet/trunk/tests/checkfails.tcl
tcl/rivet/trunk/tests/failtest.tcl
tcl/rivet/trunk/tests/failtest.test
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/src/rivetcmds/rivetCore.c
tcl/rivet/trunk/tests/rivet.test
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1584612&r1=1584611&r2=1584612&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Fri Apr 4 10:52:52 2014
@@ -1,3 +1,8 @@
+2014-04-04 Massimo Manghi <mx...@apache.org>
+ * tests/failtest.tcl,failtest.test,checkfail.tcl: adding script for commands that must fail
+ outside of a request processing (to be completed)
+ * src/rivetcmds/rivetCore.c: comment rephrased
+
2014-03-30 Massimo Manghi <mx...@apache.org>
* src/rivetcmds/rivetInspect.c: Add function Rivet_CurrentServerRec returning a dictionary of
some field values stored in the server_rec object
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1584612&r1=1584611&r2=1584612&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Fri Apr 4 10:52:52 2014
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -94,7 +94,6 @@ DIST_COMMON = $(srcdir)/Makefile.in $(sr
README TODO tclconfig/compile tclconfig/config.guess \
tclconfig/config.sub tclconfig/depcomp tclconfig/install-sh \
tclconfig/missing tclconfig/ltmain.sh \
- $(top_srcdir)/tclconfig/compile \
$(top_srcdir)/tclconfig/config.guess \
$(top_srcdir)/tclconfig/config.sub \
$(top_srcdir)/tclconfig/install-sh \
@@ -449,8 +448,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @test -f $@ || rm -f stamp-h1
- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -659,16 +658,10 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -710,10 +703,9 @@ distcheck: dist
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
Modified: tcl/rivet/trunk/src/rivetcmds/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/rivetcmds/rivetCore.c?rev=1584612&r1=1584611&r2=1584612&view=diff
==============================================================================
--- tcl/rivet/trunk/src/rivetcmds/rivetCore.c (original)
+++ tcl/rivet/trunk/src/rivetcmds/rivetCore.c Fri Apr 4 10:52:52 2014
@@ -68,7 +68,7 @@ if (r == NULL)\
*
* Adds standard error information to the interpreter. This procedure makes
* sense only when called by C functions implementing Tcl commands that
- * make sense only if a valid requiest_rec object is required. These
+ * are meaningful only if a valid requiest_rec object is defined. These
* procedures must return TCL_ERROR right away after Rivet_NoRequestRecord
* returns
*
Added: tcl/rivet/trunk/tests/checkfails.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/checkfails.tcl?rev=1584612&view=auto
==============================================================================
--- tcl/rivet/trunk/tests/checkfails.tcl (added)
+++ tcl/rivet/trunk/tests/checkfails.tcl Fri Apr 4 10:52:52 2014
@@ -0,0 +1,4 @@
+
+array set ::failtest { env 0 makeurl 0 }
+if {[catch {::rivet::env HTTP_HOST}]} { set ::failtest(env) 1 }
+if {[catch {::rivet::makeurl}]} { set ::failtest(makeurl) 1 }
Added: tcl/rivet/trunk/tests/failtest.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/failtest.tcl?rev=1584612&view=auto
==============================================================================
--- tcl/rivet/trunk/tests/failtest.tcl (added)
+++ tcl/rivet/trunk/tests/failtest.tcl Fri Apr 4 10:52:52 2014
@@ -0,0 +1,3 @@
+foreach cmd {env makeurl} {
+ puts "$cmd->$::failtest($cmd)"
+}
Added: tcl/rivet/trunk/tests/failtest.test
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/failtest.test?rev=1584612&view=auto
==============================================================================
--- tcl/rivet/trunk/tests/failtest.test (added)
+++ tcl/rivet/trunk/tests/failtest.test Fri Apr 4 10:52:52 2014
@@ -0,0 +1,17 @@
+# This test is for those commands that must not run outside of a request processing
+
+::tcltest::test failtest-1.1 {commands that must refuse to run in child init or exit} {
+ apachetest::start {
+ -c "RivetServerConf ChildInitScript \" source checkfails.tcl \"" } {} {
+ catch {
+ set inspect_page [::http::geturl "${urlbase}failtest.tcl"]
+ set match [::http::data $inspect_page]
+ ::http::cleanup $inspect_page
+
+ }
+ }
+ set match
+} {env->1
+makeurl->1
+}
+
Modified: tcl/rivet/trunk/tests/rivet.test
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/rivet.test?rev=1584612&r1=1584611&r2=1584612&view=diff
==============================================================================
--- tcl/rivet/trunk/tests/rivet.test (original)
+++ tcl/rivet/trunk/tests/rivet.test Fri Apr 4 10:52:52 2014
@@ -61,6 +61,7 @@ if { $testgroup2 } {
if { $testgroup3 } {
foreach Test {
+ failtest.test
broken.test
config.test
lang.test
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org