summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 00:59:23 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 00:59:23 +0000
commit016498e87cb7aa827bf53856ee4822966cac821c (patch)
tree73ef8c279d681a8ed80a1769082a59416fb2279b /tools
parent48737d2776fe57409cefb27e6bec25ac2fa7d125 (diff)
downloadchromium_src-016498e87cb7aa827bf53856ee4822966cac821c.zip
chromium_src-016498e87cb7aa827bf53856ee4822966cac821c.tar.gz
chromium_src-016498e87cb7aa827bf53856ee4822966cac821c.tar.bz2
scons: excise more scons references from the code base
I got to undo some hacks, too! TEST=compiles Review URL: http://codereview.chromium.org/5535003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/code_coverage/coverage_posix.py2
-rw-r--r--tools/export_tarball/export_tarball.py1
-rwxr-xr-xtools/heapcheck/chrome_tests.py1
-rwxr-xr-xtools/valgrind/chrome_tests.py1
-rwxr-xr-xtools/valgrind/valgrind.sh2
5 files changed, 2 insertions, 5 deletions
diff --git a/tools/code_coverage/coverage_posix.py b/tools/code_coverage/coverage_posix.py
index 45d6d33..25463a3 100755
--- a/tools/code_coverage/coverage_posix.py
+++ b/tools/code_coverage/coverage_posix.py
@@ -69,7 +69,7 @@ Linux:
the directory within the buildbot working directory in which the
solution, Debug, and Release directories are found.
It's usually "src/build", but on mac it's $DIR/../xcodebuild and on
- Linux it's $DIR/../sconsbuild or $DIR/sconsbuild or $DIR/out.
+ Linux it's $DIR/out.
This is used by buildbot scripts to help us find the output directory.
Must be used with --target.
diff --git a/tools/export_tarball/export_tarball.py b/tools/export_tarball/export_tarball.py
index e26bd8a..ddb8920 100644
--- a/tools/export_tarball/export_tarball.py
+++ b/tools/export_tarball/export_tarball.py
@@ -39,7 +39,6 @@ NONESSENTIAL_DIRS = (
'third_party/hunspell_dictionaries',
'third_party/hunspell/tests',
'third_party/lighttpd',
- 'third_party/scons',
'third_party/sqlite/test',
'third_party/vc_80',
'third_party/xdg-utils/tests',
diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py
index 97b8c84..8bd695e 100755
--- a/tools/heapcheck/chrome_tests.py
+++ b/tools/heapcheck/chrome_tests.py
@@ -147,7 +147,6 @@ class ChromeTests(object):
if not self._options.build_dir:
dirs = [
os.path.join(self._source_dir, "xcodebuild", "Debug"),
- os.path.join(self._source_dir, "sconsbuild", "Debug"),
os.path.join(self._source_dir, "out", "Debug"),
]
if exe:
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 56159f2..ab3b4e2 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -99,7 +99,6 @@ class ChromeTests:
else:
dirs = [
os.path.join(self._source_dir, "xcodebuild", "Debug"),
- os.path.join(self._source_dir, "sconsbuild", "Debug"),
os.path.join(self._source_dir, "out", "Debug"),
os.path.join(self._source_dir, "build", "Debug"),
]
diff --git a/tools/valgrind/valgrind.sh b/tools/valgrind/valgrind.sh
index 2ef7534..629fc3750 100755
--- a/tools/valgrind/valgrind.sh
+++ b/tools/valgrind/valgrind.sh
@@ -7,7 +7,7 @@
# This is a small script for manually launching valgrind, along with passing
# it the suppression file, and some helpful arguments (automatically attaching
# the debugger on failures, etc). Run it from your repo root, something like:
-# $ sh ./tools/valgrind/valgrind.sh ./sconsbuild/Debug/chrome
+# $ sh ./tools/valgrind/valgrind.sh ./out/Debug/chrome
#
# This is mostly intended for running the chrome browser interactively.
# To run unit tests, you probably want to run chrome_tests.sh instead.