[kdbus] Add SipHash algorithm

[platform/upstream/glib.git] / glib / tests / scannerapi.c

diff --git a/glib/tests/scannerapi.c b/glib/tests/scannerapi.c
index 81023e7..0505e47 100644 (file)
--- a/glib/tests/scannerapi.c
+++ b/glib/tests/scannerapi.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <glib.h>
 #include <string.h>
@@ -59,20 +57,18 @@ test_scanner_warn (ScannerFixture *fix,
 }
 
 static void
-test_scanner_error_child (ScannerFixture *fix,
-                          gconstpointer   test_data)
-{
-  int pe = fix->scanner->parse_errors;
-  g_scanner_error (fix->scanner, "scanner-error-message-test");
-  g_assert_cmpint (fix->scanner->parse_errors, ==, pe + 1);
-  exit (0);
-}
-
-static void
 test_scanner_error (ScannerFixture *fix,
                     gconstpointer   test_data)
 {
-  g_test_trap_subprocess ("/scanner/error:child", 0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR);
+  if (g_test_subprocess ())
+    {
+      int pe = fix->scanner->parse_errors;
+      g_scanner_error (fix->scanner, "scanner-error-message-test");
+      g_assert_cmpint (fix->scanner->parse_errors, ==, pe + 1);
+      exit (0);
+    }
+
+  g_test_trap_subprocess (NULL, 0, 0);
   g_test_trap_assert_passed ();
   g_test_trap_assert_stderr ("*scanner-error-message-test*");
 }
@@ -139,7 +135,6 @@ main (int   argc,
 
   g_test_add ("/scanner/warn", ScannerFixture, 0, scanner_fixture_setup, test_scanner_warn, scanner_fixture_teardown);
   g_test_add ("/scanner/error", ScannerFixture, 0, scanner_fixture_setup, test_scanner_error, scanner_fixture_teardown);
-  g_test_add ("/scanner/error:child", ScannerFixture, 0, scanner_fixture_setup, test_scanner_error_child, scanner_fixture_teardown);
   g_test_add ("/scanner/symbols", ScannerFixture, 0, scanner_fixture_setup, test_scanner_symbols, scanner_fixture_teardown);
   g_test_add ("/scanner/tokens", ScannerFixture, 0, scanner_fixture_setup, test_scanner_tokens, scanner_fixture_teardown);