| Index: content/test/layout_tests/runner/TestCommon.cpp
|
| diff --git a/third_party/tcmalloc/chromium/src/base/thread_lister.c b/content/test/layout_tests/runner/TestCommon.cpp
|
| similarity index 55%
|
| copy from third_party/tcmalloc/chromium/src/base/thread_lister.c
|
| copy to content/test/layout_tests/runner/TestCommon.cpp
|
| index bc180dba7a9f2ba3b8261009c8af85f0b1d4a023..c2752ff38a0b50d897f4550f5dda49097bd6fb99 100644
|
| --- a/third_party/tcmalloc/chromium/src/base/thread_lister.c
|
| +++ b/content/test/layout_tests/runner/TestCommon.cpp
|
| @@ -1,5 +1,9 @@
|
| -/* Copyright (c) 2005-2007, Google Inc.
|
| - * All rights reserved.
|
| +// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Use of this source code is governed by a BSD-style license that can be
|
| +// found in the LICENSE file.
|
| +
|
| +/*
|
| + * Copyright (C) 2013 Google Inc. All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are
|
| @@ -26,52 +30,38 @@
|
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - *
|
| - * ---
|
| - * Author: Markus Gutschke
|
| */
|
|
|
| -#include "config.h"
|
| -#include <stdio.h> /* needed for NULL on some powerpc platforms (?!) */
|
| -#ifdef HAVE_SYS_PRCTL
|
| -# include <sys/prctl.h>
|
| -#endif
|
| -#include "base/thread_lister.h"
|
| -#include "base/linuxthreads.h"
|
| -/* Include other thread listers here that define THREADS macro
|
| - * only when they can provide a good implementation.
|
| - */
|
| +#include "content/test/layout_tests/runner/TestCommon.h"
|
|
|
| -#ifndef THREADS
|
| +using namespace std;
|
|
|
| -/* Default trivial thread lister for single-threaded applications,
|
| - * or if the multi-threading code has not been ported, yet.
|
| - */
|
| +namespace WebTestRunner {
|
| +
|
| +namespace {
|
|
|
| -int ListAllProcessThreads(void *parameter,
|
| - ListAllProcessThreadsCallBack callback, ...) {
|
| - int rc;
|
| - va_list ap;
|
| - pid_t pid;
|
| +const char layoutTestsPattern[] = "/LayoutTests/";
|
| +const string::size_type layoutTestsPatternSize = sizeof(layoutTestsPattern) - 1;
|
| +const char fileUrlPattern[] = "file:/";
|
| +const char fileTestPrefix[] = "(file test):";
|
| +const char dataUrlPattern[] = "data:";
|
| +const string::size_type dataUrlPatternSize = sizeof(dataUrlPattern) - 1;
|
|
|
| -#ifdef HAVE_SYS_PRCTL
|
| - int dumpable = prctl(PR_GET_DUMPABLE, 0);
|
| - if (!dumpable)
|
| - prctl(PR_SET_DUMPABLE, 1);
|
| -#endif
|
| - va_start(ap, callback);
|
| - pid = getpid();
|
| - rc = callback(parameter, 1, &pid, ap);
|
| - va_end(ap);
|
| -#ifdef HAVE_SYS_PRCTL
|
| - if (!dumpable)
|
| - prctl(PR_SET_DUMPABLE, 0);
|
| -#endif
|
| - return rc;
|
| }
|
|
|
| -int ResumeAllProcessThreads(int num_threads, pid_t *thread_pids) {
|
| - return 1;
|
| +string normalizeLayoutTestURL(const string& url)
|
| +{
|
| + string result = url;
|
| + size_t pos;
|
| + if (!url.find(fileUrlPattern) && ((pos = url.find(layoutTestsPattern)) != string::npos)) {
|
| + // adjust file URLs to match upstream results.
|
| + result.replace(0, pos + layoutTestsPatternSize, fileTestPrefix);
|
| + } else if (!url.find(dataUrlPattern)) {
|
| + // URL-escape data URLs to match results upstream.
|
| + string path = url.substr(dataUrlPatternSize);
|
| + result.replace(dataUrlPatternSize, url.length(), path);
|
| + }
|
| + return result;
|
| }
|
|
|
| -#endif /* ifndef THREADS */
|
| +}
|
|
|