You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2009/12/15 07:15:17 UTC
svn commit: r890658 [24/27] - in /subversion/branches/issue-3242-dev: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6.x...
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/svndiff-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/svndiff-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/svndiff-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/svndiff-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* svndiff-test.c -- test driver for text deltas
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/vdelta-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/vdelta-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/vdelta-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/vdelta-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* vdelta-test.c -- test driver for text deltas
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/window-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/window-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/window-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_delta/window-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* window-test.c: Test delta window generation
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_diff/diff-diff3-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_diff/diff-diff3-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_diff/diff-diff3-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_diff/diff-diff3-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* Incomplete regression tests for the diff/diff3 library.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_diff/parse-diff-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_diff/parse-diff-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_diff/parse-diff-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_diff/parse-diff-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* Regression tests for the diff/diff3 library -- parsing unidiffs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs/fs-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs/fs-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* fs-test.c --- tests for the filesystem
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -4741,13 +4741,12 @@
SVN_ERR(svn_fs__begin_obliteration_txn(&txn, fs, 3, subpool));
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_fs_revision_root(&root, fs, 3, subpool));
- /* try svn_fs_fs__dag_clone_root(&dag_node, root->fs, root->txn, pool); */
- SVN_ERR(svn_fs_revision_link(root, txn_root, "", subpool));
SVN_ERR(svn_fs_delete(txn_root, "A/D/H/chi", subpool));
SVN_ERR(svn_fs__commit_obliteration_txn(3, txn, subpool));
svn_pool_clear(subpool);
- return SVN_NO_ERROR;
+ return svn_error_create(SVN_ERR_TEST_FAILED, NULL,
+ "Feature and test are still under development");
}
/* ------------------------------------------------------------------------ */
@@ -4829,7 +4828,7 @@
"test svn_fs_node_origin_rev"),
SVN_TEST_OPTS_PASS(small_file_integrity,
"create and modify small file"),
- SVN_TEST_OPTS_SKIP(obliterate_1, TRUE, /* Skipped as not impl. yet */
- "obliterate 1"),
+ SVN_TEST_OPTS_WIMP(obliterate_1,
+ "obliterate 1", "obliterate is in development"),
SVN_TEST_NULL
};
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs/locks-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs/locks-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs/locks-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs/locks-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* lock-test.c --- tests for the filesystem locking functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/changes-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/changes-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/changes-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/changes-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* changes-test.c --- test `changes' interfaces
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/fs-base-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/fs-base-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/fs-base-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/fs-base-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* fs-test.c --- tests for the filesystem
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/key-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/key-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/key-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/key-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* key-test.c --- tests for the key gen functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/strings-reps-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/strings-reps-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/strings-reps-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_base/strings-reps-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* strings-reps-test.c --- test `strings' and `representations' interfaces
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_fs/fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_fs/fs-pack-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_fs_fs/fs-pack-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* fs-pack-test.c --- tests for the filesystem
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -28,6 +28,7 @@
#include "../../libsvn_fs_fs/fs.h"
#include "svn_pools.h"
+#include "svn_props.h"
#include "svn_fs.h"
#include "../svn_test_fs.h"
@@ -341,6 +342,52 @@
}
#undef REPO_NAME
+/* Get/set revprop while repository is being packed in background. */
+#define REPO_NAME "test-get-set-revprop-packed-fs"
+#define SHARD_SIZE 4
+#define MAX_REV 1
+static svn_error_t *
+get_set_revprop_packed_fs(const svn_test_opts_t *opts,
+ apr_pool_t *pool)
+{
+ svn_fs_t *fs;
+ svn_fs_txn_t *txn;
+ svn_fs_root_t *txn_root;
+ const char *conflict;
+ svn_revnum_t after_rev;
+ svn_string_t *prop_value;
+ apr_pool_t *subpool;
+
+ /* Bail (with success) on known-untestable scenarios */
+ if ((strcmp(opts->fs_type, "fsfs") != 0)
+ || (opts->server_minor_version && (opts->server_minor_version < 7)))
+ return SVN_NO_ERROR;
+
+ /* Create the packed FS and open it. */
+ SVN_ERR(create_packed_filesystem(REPO_NAME, opts, MAX_REV, SHARD_SIZE, pool));
+ SVN_ERR(svn_fs_open(&fs, REPO_NAME, NULL, pool));
+
+ subpool = svn_pool_create(pool);
+ /* Do a commit to trigger packing. */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, MAX_REV + 1, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_test__set_file_contents(txn_root, "iota", "new-iota", subpool));
+ SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, subpool));
+ svn_pool_clear(subpool);
+
+ /* Pack the repository. */
+ SVN_ERR(svn_fs_pack(REPO_NAME, NULL, NULL, NULL, NULL, pool));
+
+ /* Try to get revprop for revision 0. */
+ SVN_ERR(svn_fs_revision_prop(&prop_value, fs, 0, SVN_PROP_REVISION_AUTHOR, pool));
+
+ /* Try to change revprop for revision 0. */
+ SVN_ERR(svn_fs_change_rev_prop(fs, 0, SVN_PROP_REVISION_AUTHOR,
+ svn_string_create("tweaked-author", pool), pool));
+
+ return SVN_NO_ERROR;
+}
+
/* ------------------------------------------------------------------------ */
/* The test table. */
@@ -356,5 +403,7 @@
"read from a packed FSFS filesystem"),
SVN_TEST_OPTS_PASS(commit_packed_fs,
"commit to a packed FSFS filesystem"),
+ SVN_TEST_OPTS_PASS(get_set_revprop_packed_fs,
+ "get/set revprop while packing FSFS filesystem"),
SVN_TEST_NULL
};
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_ra_local/ra-local-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_ra_local/ra-local-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_ra_local/ra-local-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_ra_local/ra-local-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* ra-local-test.c : basic tests for the RA LOCAL library
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/dir-delta-editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/dir-delta-editor.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/dir-delta-editor.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/dir-delta-editor.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* svn_tests_editor.c: a `dummy' editor implementation for testing
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/dir-delta-editor.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/dir-delta-editor.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/dir-delta-editor.h (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/dir-delta-editor.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* svn_tests_editor.c: a `dummy' editor implementation for testing
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/repos-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_repos/repos-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* repos-test.c --- tests for the filesystem
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/auth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/auth-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/auth-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/auth-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* auth-test.c -- test the auth functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/cache-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/cache-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/cache-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/cache-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* cache-test.c -- test the in-memory cache
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/checksum-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/checksum-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/checksum-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/checksum-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* checksum-test.c: tests checksum functions.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/compat-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/compat-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/compat-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/compat-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* compat-test.c: tests svn_ver_compatible
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/config-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/config-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/config-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/config-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* config-test.c: tests svn_config
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/dirent_uri-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/dirent_uri-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* dirent_uri-test.c -- test the directory entry and URI functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/eol-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/eol-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/eol-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/eol-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* eol-test.c --- tests for the eol functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/error-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/error-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/error-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/error-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* error-test.c -- test the error functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/hashdump-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/hashdump-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/hashdump-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/hashdump-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* hashdump-test.c : testing the reading/writing of hashes
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/mergeinfo-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/mergeinfo-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* mergeinfo-test.c -- test the mergeinfo functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -154,9 +154,12 @@
"/trunk",
"/trunk",
"/branch",
- "patch-common::netasq-bpf.c",
- "patch-common_netasq-bpf.c:",
- ":patch:common:netasq:bpf.c",
+
+ /* svn_mergeinfo_parse converts relative merge soure paths to absolute. */
+ "/patch-common::netasq-bpf.c",
+ "/patch-common_netasq-bpf.c:",
+ "/:patch:common:netasq:bpf.c",
+
"/trunk",
"/trunk",
"/trunk",
@@ -1083,6 +1086,22 @@
if (svn_string_compare(expected, output) != TRUE)
return fail(pool, "Mergeinfo string not what we expected");
+ /* Manually construct some mergeinfo with relative path
+ merge source keys. These should be tolerated as input
+ to svn_mergeinfo_to_string(), but the resulting svn_string_t
+ should have absolute keys. */
+ info2 = apr_hash_make(pool);
+ apr_hash_set(info2, "fred",
+ APR_HASH_KEY_STRING,
+ apr_hash_get(info1, "/fred", APR_HASH_KEY_STRING));
+ apr_hash_set(info2, "trunk",
+ APR_HASH_KEY_STRING,
+ apr_hash_get(info1, "/trunk", APR_HASH_KEY_STRING));
+ SVN_ERR(svn_mergeinfo_to_string(&output, info2, pool));
+
+ if (svn_string_compare(expected, output) != TRUE)
+ return fail(pool, "Mergeinfo string not what we expected");
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/opt-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/opt-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/opt-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/opt-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* opt-test.c -- test the option functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/path-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/path-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/path-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/path-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* path-test.c -- test the path functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/revision-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/revision-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/revision-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/revision-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* revision-test.c -- test the revision functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/skel-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/skel-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/skel-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/skel-test.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* skel-test.c --- tests for the skeleton functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/stream-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/stream-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/stream-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/stream-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* stream-test.c -- test the stream functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/string-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/string-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/string-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/string-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* string-test.c: a collection of libsvn_string tests
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/target-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/target-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/target-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/target-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* target-test.c: test the condense_targets functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/time-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/time-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/time-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/time-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* time-test.c -- test the time functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/translate-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/translate-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/translate-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/translate-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* translate-test.c -- test the eol and keyword translation subroutine
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/utf-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/utf-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/utf-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/utf-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* utf-test.c -- test the utf functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_wc/db-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_wc/db-test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* db-test.c : test the wc_db subsystem
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -306,7 +306,8 @@
WC_METADATA_SQL_13,
WC_METADATA_SQL_14,
- WC_METADATA_SQL_15
+ WC_METADATA_SQL_15,
+ WC_METADATA_SQL_16
};
Modified: subversion/branches/issue-3242-dev/subversion/tests/libsvn_wc/tree-conflict-data-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/libsvn_wc/tree-conflict-data-test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/libsvn_wc/tree-conflict-data-test.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/libsvn_wc/tree-conflict-data-test.c Tue Dec 15 06:14:36 2009
@@ -1,4 +1,25 @@
/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+/*
* tree-conflict-data-test.c -- test the storage of tree conflict data
*/
Modified: subversion/branches/issue-3242-dev/subversion/tests/svn_test.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/svn_test.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/svn_test.h (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/svn_test.h Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
/*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/svn_test_fs.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/svn_test_fs.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/svn_test_fs.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* fs-helpers.c --- tests for the filesystem
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/svn_test_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/svn_test_fs.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/svn_test_fs.h (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/svn_test_fs.h Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* fs-helpers.c --- tests for the filesystem
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/tests/svn_test_main.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/tests/svn_test_main.c (original)
+++ subversion/branches/issue-3242-dev/subversion/tests/svn_test_main.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* tests-main.c: shared main() & friends for SVN test-suite programs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/tools/backup/hot-backup.py.in
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/backup/hot-backup.py.in?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/backup/hot-backup.py.in (original)
+++ subversion/branches/issue-3242-dev/tools/backup/hot-backup.py.in Tue Dec 15 06:14:36 2009
@@ -10,10 +10,10 @@
# See http://subversion.tigris.org for more information.
#
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/tools/bdb/erase-all-text-data.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/bdb/erase-all-text-data.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/bdb/erase-all-text-data.py (original)
+++ subversion/branches/issue-3242-dev/tools/bdb/erase-all-text-data.py Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# Erases the text of every file in a BDB repository
#
Modified: subversion/branches/issue-3242-dev/tools/bdb/skel.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/bdb/skel.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/bdb/skel.py (original)
+++ subversion/branches/issue-3242-dev/tools/bdb/skel.py Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# Python parser for Subversion skels
import string, re
Modified: subversion/branches/issue-3242-dev/tools/bdb/svn-bdb-view.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/bdb/svn-bdb-view.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/bdb/svn-bdb-view.py (original)
+++ subversion/branches/issue-3242-dev/tools/bdb/svn-bdb-view.py Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# This is a pretty-printer for subversion BDB repository databases.
#
Modified: subversion/branches/issue-3242-dev/tools/bdb/svnfs.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/bdb/svnfs.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/bdb/svnfs.py (original)
+++ subversion/branches/issue-3242-dev/tools/bdb/svnfs.py Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# A handle object for convenience in opening a svn repository
import sys
Modified: subversion/branches/issue-3242-dev/tools/bdb/whatis-rep.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/bdb/whatis-rep.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/bdb/whatis-rep.py (original)
+++ subversion/branches/issue-3242-dev/tools/bdb/whatis-rep.py Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# Print a description (including data, path, and revision) of the
# specified node reps in a Subversion filesystem. Walks as much of
# the reps table as necessary to locate the data (e.g. does a table
Modified: subversion/branches/issue-3242-dev/tools/buildbot/master/Feeder.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/master/Feeder.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/master/Feeder.py (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/master/Feeder.py Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# This file is part of the Buildbot configuration for the Subversion project.
# The original file was created by Lieven Govaerts
#
Modified: subversion/branches/issue-3242-dev/tools/buildbot/master/SVNMailNotifier.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/master/SVNMailNotifier.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/master/SVNMailNotifier.py (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/master/SVNMailNotifier.py Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
import os
import urllib
import re
Modified: subversion/branches/issue-3242-dev/tools/buildbot/master/master.cfg
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/master/master.cfg?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/master/master.cfg (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/master/master.cfg Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
# -*- python -*-
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
import os, os.path, re
@@ -18,6 +38,8 @@
from Feeder import WebStatusWithFeeds
import private
+REPO="http://svn.apache.org/repos/asf/subversion/"
+
s = factory.s
# This is the dictionary that the buildmaster pays attention to. We also use
@@ -32,10 +54,11 @@
BuildSlave("eh-debsarge1", private.slavePwd),
BuildSlave("djh-xp-vse2005", private.slavePwd),
BuildSlave("x64-ubuntu", private.hwrightPwd),
+ BuildSlave("x64-centos", private.wandPwd),
]
# sources
-c['change_source'] = SVNPoller("http://svn.collab.net/repos/svn/",
+c['change_source'] = SVNPoller(REPO,
split_file=split_file_branches,
svnbin=private.svnbin,
pollinterval=300)
@@ -64,6 +87,7 @@
5*60, ["x86-macosx-gnu shared",
"debian-x86_64-32 shared gcc",
"x64-ubuntu gcc",
+ "x64-centos gcc",
],
fileIsImportant=isImportant)
@@ -82,7 +106,7 @@
# define default set of steps, all under masters control.
defSteps = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], timeout=3600),
- source.SVN(baseURL="http://svn.collab.net/repos/svn/",defaultBranch='trunk', timeout=3600),
+ source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600),
shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True),
shell.ShellCommand(name="Test fsfs+ra_neon", command=["../svncheck.sh", "fsfs", "ra_neon"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True),
]
@@ -90,7 +114,7 @@
defFact = factory.BuildFactory(defSteps)
# define Windows custom steps
-winSteps = [source.SVN(baseURL="http://svn.collab.net/repos/svn/",defaultBranch='trunk', timeout=3600),
+winSteps = [source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600),
shell.ShellCommand(name="Build", command=["..\svnbuild.bat"], timeout=3600, haltOnFailure=True),
shell.ShellCommand(name="Test fsfs+ra_local", command=["..\svncheck.bat","fsfs","ra_local"], timeout=3600, flunkOnFailure=True),
shell.ShellCommand(name="Test fsfs+ra_dav", command=["..\svncheck.bat","fsfs","ra_dav"], timeout=3600, flunkOnFailure=True),
@@ -100,7 +124,7 @@
winFact = factory.BuildFactory(winSteps)
# define Windows 6 way steps
-win6wSteps = [source.SVN(baseURL="http://svn.collab.net/repos/svn/",defaultBranch='trunk', timeout=3600),
+win6wSteps = [source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600),
shell.ShellCommand(name="Cleanup", command=["..\svnclean.bat"], timeout=3600),
shell.ShellCommand(name="Build", command=["..\svnbuild.bat", "%(branch)"], timeout=3600, haltOnFailure=True),
shell.ShellCommand(name="Test fsfs+ra_local", command=["..\svncheck.bat","fsfs","ra_local"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True),
@@ -109,7 +133,7 @@
# define set of steps for eh-x84_64-32, clean step comes first.
ehSteps = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], workdir='', timeout=3600),
- source.SVN(baseURL="http://svn.collab.net/repos/svn/",defaultBranch='trunk', timeout=3600),
+ source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600),
shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True),
shell.ShellCommand(name="Test fsfs+ra_svn", command=["../svncheck.sh","fsfs","ra_svn"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True),
]
@@ -117,7 +141,7 @@
# nightly build ra_serf
serfSteps = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], timeout=3600),
- source.SVN(baseURL="http://svn.collab.net/repos/svn/",defaultBranch='trunk', timeout=3600),
+ source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600),
shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True),
shell.ShellCommand(name="Test fsfs+ra_serf", command=["../svncheck.sh", "fsfs", "ra_serf"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True),
]
@@ -125,13 +149,22 @@
# define set of steps for x64-ubuntu, clean step comes first.
x64ubSteps = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], workdir='', timeout=3600),
- source.SVN(baseURL="http://svn.collab.net/repos/svn/",defaultBranch='trunk', timeout=3600),
+ source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600),
shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True),
shell.ShellCommand(name="Test fsfs+ra_local", command=["../svncheck.sh","fsfs","ra_local"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=False),
shell.ShellCommand(name="Test bindings", command=["../svncheck-bindings.sh","fsfs","ra_local"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True),
]
x64ubFact = factory.BuildFactory(x64ubSteps)
+x64coSteps = [shell.ShellCommand(name="Cleanup", command=["../svnclean.sh"], timeout=3600),
+ source.SVN(baseURL=REPO,defaultBranch='trunk', timeout=3600),
+ shell.ShellCommand(name="Build", command=["../svnbuild.sh"], logfiles={"configlog": "config.log"}, timeout=3600, haltOnFailure=True),
+ shell.ShellCommand(name="Test fsfs+ra_local", command=["../svncheck.sh", "fsfs", "ra_neon"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True),
+ shell.ShellCommand(name="Test bindings", command=["../svncheck-bindings.sh","fsfs","ra_neon"], logfiles={"testlog": "tests.log"}, timeout=3600, flunkOnFailure=True),
+ ]
+x64coFact = factory.BuildFactory(x64coSteps)
+
+
c['builders'] = [
{'name': "x86-macosx-gnu shared",
'slavename': "osx10.4-gcc4.0.1-ia32",
@@ -163,7 +196,13 @@
'factory': x64ubFact,
'category': "prod",
},
- ]
+ {'name': "x64-centos gcc",
+ 'slavename': "x64-centos",
+ 'builddir': "x64-centos",
+ 'factory': x64coFact,
+ 'category': "prod",
+ },
+]
# 'slavePortnum' defines the TCP port to listen on. This must match the value
# configured into the buildslaves (with their --master option)
Modified: subversion/branches/issue-3242-dev/tools/buildbot/master/private-sample.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/master/private-sample.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/master/private-sample.py (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/master/private-sample.py Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# -*- python -*-
svnbin="svn"
Modified: subversion/branches/issue-3242-dev/tools/buildbot/master/public_html/index.html
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/master/public_html/index.html?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/master/public_html/index.html (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/master/public_html/index.html Tue Dec 15 06:14:36 2009
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnbuild.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnbuild.sh (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnbuild.sh Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
set -x
@@ -15,8 +35,10 @@
--with-apxs=/usr/sbin/apxs \
--without-berkeley-db \
--with-apr=/usr \
- --with-jdk \
--with-apr-util=/usr \
+ --with-jdk=/opt/java/jdk1.6.0_15 \
+ --with-junit=/home/bt/junit-4.4.jar \
+ --with-sqlite=/home/bt/sqlite-3.6.17/sqlite3.c \
|| exit $?
echo "========= make"
Modified: subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svncheck-bindings.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svncheck-bindings.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svncheck-bindings.sh (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svncheck-bindings.sh Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
set -x
@@ -13,7 +33,8 @@
echo "========= make check-swig-py"
make check-swig-py || RC=$?
-echo "========= make check-swig-rb"
-make check-swig-rb || RC=$?
+# ruby test currently failing, generating SEGV on centos
+#echo "========= make check-swig-rb"
+#make check-swig-rb # || RC=$?
exit ${RC}
Modified: subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svncheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svncheck.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svncheck.sh (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svncheck.sh Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
set -x
@@ -13,8 +33,8 @@
mkdir -p subversion/tests/cmdline/svn-test-work
test -e ../mount-ramdrive && ../mount-ramdrive
-echo "========= make check"
-make check FS_TYPE=$1 CLEANUP=1 || exit $?
+echo "========= make davautocheck"
+make davautocheck FS_TYPE=$1 CLEANUP=1 || exit $?
# the bindings are checked with svncheck-bindings.sh
exit 0
Modified: subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnclean.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnclean.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnclean.sh (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnclean.sh Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
set -x
Modified: subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnlog.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnlog.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnlog.sh (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/slaves/centos/svnlog.sh Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
set -x
Modified: subversion/branches/issue-3242-dev/tools/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c (original)
+++ subversion/branches/issue-3242-dev/tools/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c Tue Dec 15 06:14:36 2009
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
#include <stdio.h>
#include <unistd.h>