diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-17 18:40:13 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-06-17 18:40:13 -0700 |
| commit | 56f98620bb46560cf2cb37c409cbdf3e80986812 (patch) | |
| tree | 74e310007478032b89f2aea412c0b4a2eed96bc2 /tools | |
| parent | fa1433a4b6b0d6bbe817b4ab5f51f6167ecd837a (diff) | |
| parent | 7b4dc532dd37271f883f9b30f28c7dd50baf41cb (diff) | |
Merge pull request #6863 from vjpai/wheezy
Make C++ compile and run under gcc-4.4
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/test/cxx_wheezy_x64/Dockerfile | 4 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile b/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile index 6f330f9166..dd9a79b1ed 100644 --- a/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile @@ -70,7 +70,9 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c RUN apt-get update && apt-get install -y \ gcc-4.4 \ - gcc-4.4-multilib + gcc-4.4-multilib \ + g++-4.4 \ + g++-4.4-multilib RUN wget https://openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 882b3494b2..ab42c49292 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -793,6 +793,7 @@ argp.add_argument('-n', '--runs_per_test', default=1, type=runs_per_test_type, help='A positive integer or "inf". If "inf", all tests will run in an ' 'infinite loop. Especially useful in combination with "-f"') argp.add_argument('-r', '--regex', default='.*', type=str) +argp.add_argument('--regex_exclude', default='', type=str) argp.add_argument('-j', '--jobs', default=multiprocessing.cpu_count(), type=int) argp.add_argument('-s', '--slowdown', default=1.0, type=float) argp.add_argument('-f', '--forever', @@ -1209,7 +1210,9 @@ def _build_and_run( spec for language in languages for spec in language.test_specs() - if re.search(args.regex, spec.shortname)) + if (re.search(args.regex, spec.shortname) and + (args.regex_exclude == '' or + not re.search(args.regex_exclude, spec.shortname)))) # When running on travis, we want out test runs to be as similar as possible # for reproducibility purposes. if args.travis: |