glib r7041 - in trunk: . docs/reference docs/reference/glib/tmpl glib
- From: matthiasc svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r7041 - in trunk: . docs/reference docs/reference/glib/tmpl glib
- Date: Sun, 15 Jun 2008 00:49:31 +0000 (UTC)
Author: matthiasc
Date: Sun Jun 15 00:49:30 2008
New Revision: 7041
URL: http://svn.gnome.org/viewvc/glib?rev=7041&view=rev
Log:
Move docs around
Modified:
trunk/ChangeLog
trunk/docs/reference/ChangeLog
trunk/docs/reference/glib/tmpl/testing.sgml
trunk/glib/gtestutils.c
Modified: trunk/docs/reference/glib/tmpl/testing.sgml
==============================================================================
--- trunk/docs/reference/glib/tmpl/testing.sgml (original)
+++ trunk/docs/reference/glib/tmpl/testing.sgml Sun Jun 15 00:49:30 2008
@@ -253,12 +253,24 @@
<!-- ##### ENUM GTestTrapFlags ##### -->
<para>
-
+Test traps are guards around forked tests. These flags
+determine what traps to set.
</para>
- G_TEST_TRAP_SILENCE_STDOUT:
- G_TEST_TRAP_SILENCE_STDERR:
- G_TEST_TRAP_INHERIT_STDIN:
+ G_TEST_TRAP_SILENCE_STDOUT: Redirect stdout of the test child to
+ <filename>/dev/null</filename> so it cannot be observed on the
+ console during test runs. The actual output is still captured
+ though to allow later tests with g_test_trap_assert_stdout().
+
+ G_TEST_TRAP_SILENCE_STDERR: Redirect stderr of the test child to
+ <filename>/dev/null</filename> so it cannot be observed on the
+ console during test runs. The actual output is still captured
+ though to allow later tests with g_test_trap_assert_stderr().
+
+ G_TEST_TRAP_INHERIT_STDIN: If this flag is given, stdin of the forked
+ child process is shared with stdin of its parent process. It is
+ redirected to <filename>/dev/null</filename> otherwise.
+
<!-- ##### FUNCTION g_test_trap_fork ##### -->
<para>
Modified: trunk/glib/gtestutils.c
==============================================================================
--- trunk/glib/gtestutils.c (original)
+++ trunk/glib/gtestutils.c Sun Jun 15 00:49:30 2008
@@ -1489,35 +1489,7 @@
* not return or that might abort. The forked test case is aborted
* and considered failing if its run time exceeds @usec_timeout.
*
- * The forking behavior can be configured with the following flags:
- * <variablelist>
- * <varlistentry>
- * <term>%G_TEST_TRAP_SILENCE_STDOUT</term>
- * <listitem><para>
- * redirect stdout of the test child to <filename>/dev/null</filename>
- * so it cannot be observed on the console during test runs.
- * The actual output is still captured though to allow later
- * tests with g_test_trap_assert_stdout().
- * </para></listitem>
- * </varlistentry>
- * <varlistentry>
- * <term>%G_TEST_TRAP_SILENCE_STDERR</term>
- * <listitem><para>
- * redirect stderr of the test child to <filename>/dev/null</filename>
- * so it cannot be observed on the console during test runs.
- * The actual output is still captured though to allow later
- * tests with g_test_trap_assert_stderr().
- * </para></listitem>
- * </varlistentry>
- * <varlistentry>
- * <term>%G_TEST_TRAP_INHERIT_STDIN</term>
- * <listitem><para>
- * if this flag is given, stdin of the forked child process is
- * shared with stdin of its parent process. It is redirected to
- * <filename>/dev/null</filename> otherwise.
- * </para></listitem>
- * </varlistentry>
- * </variablelist>
+ * The forking behavior can be configured with the #GTestTrapFlags flags.
*
* In the following example, the test code forks, the forked child
* process produces some sample output and exits successfully.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]