Author: stefan2
Date: Thu Apr 12 12:24:59 2012
New Revision: 1325217
URL: http://svn.apache.org/viewvc?rev=1325217&view=rev
Log:
On the revprop-cache branch: Fix build of named_atomic-test-proc
* subversion/tests/libsvn_subr/named_atomic-test-common.h
move necessary #includes here from named_atomic-test.c
(TEST_NAMESPACE, ATOMIC_NAME, HUGE_VALUE): move here from
named_atomic-test.c
* subversion/tests/libsvn_subr/named_atomic-test-proc.c
remove unnecessary #includes
(main): call the right test function
* subversion/tests/libsvn_subr/named_atomic-test.c
remove unnecessary #includes
(TEST_NAMESPACE, ATOMIC_NAME, HUGE_VALUE): drop here
Modified:
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-common.h
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-proc.c
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c
Modified:
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-common.h
URL:
http://svn.apache.org/viewvc/subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-common.h?rev=1325217&r1=1325216&r2=1325217&view=diff
==============================================================================
---
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-common.h
(original)
+++
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-common.h
Thu Apr 12 12:24:59 2012
@@ -24,6 +24,21 @@
+#include "../svn_test.h"
+#include "svn_pools.h"
+#include "private/svn_named_atomic.h"
+
+/* Some constants that we will use in our tests */
+
+/* to separate this code from any production environment */
+#define TEST_NAMESPACE "SvnTests"
+
+/* All our atomics start with that name */
+#define ATOMIC_NAME "MyTestAtomic"
+
+/* Factor used to create non-trivial 64 bit numbers */
+#define HUGE_VALUE 1234567890123456ll
+
/* "pipeline" test: worker with ID 0 initializes the data; all workers
* (COUNT in total) have one input and one output bucket that form a ring
* spanning all workers. Each worker passes the value along ITERATIONS times.
Modified:
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-proc.c
URL:
http://svn.apache.org/viewvc/subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-proc.c?rev=1325217&r1=1325216&r2=1325217&view=diff
==============================================================================
---
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-proc.c
(original)
+++
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test-proc.c
Thu Apr 12 12:24:59 2012
@@ -28,12 +28,6 @@
#include <stdio.h>
-#include <apr_pools.h>
-
-#include "svn_io.h"
-#include "svn_error.h"
-#include "svn_pools.h"
-
/* shared test implementation */
#include "named_atomic-test-common.h"
@@ -71,7 +65,7 @@ main(int argc, const char *argv[])
/* run test routine */
- err = test(id, count, iterations, pool);
+ err = test_pipeline(id, count, iterations, pool);
if (err)
{
got_error = TRUE;
Modified:
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c?rev=1325217&r1=1325216&r2=1325217&view=diff
==============================================================================
---
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c
(original)
+++
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c
Thu Apr 12 12:24:59 2012
@@ -27,35 +27,16 @@
#include <stdio.h>
-#include <string.h>
-
-#include <apr_pools.h>
#include <apr_file_io.h>
-#include "../svn_test.h"
-
#include "svn_io.h"
-#include "svn_error.h"
-#include "svn_pools.h"
-#include "private/svn_named_atomic.h"
-
-/* Some constants that we will use in our tests */
-
-/* to separate this code from any production environment */
-#define TEST_NAMESPACE "SvnTests"
-
-/* All our atomics start with that name */
-#define ATOMIC_NAME "MyTestAtomic"
-/* Factor used to create non-trivial 64 bit numbers */
-#define HUGE_VALUE 1234567890123456ll
+/* shared test implementation */
+#include "named_atomic-test-common.h"
/* Name of the worker process executable */
#define TEST_PROC "named_atomic-test-proc"
-/* shared test implementation */
-#include "named_atomic-test-common.h"
-
/* number of hardware threads (logical cores) that we may use.
* Will be set to at least 2 - even on unicore machines. */
static int hw_thread_count = 0;
