From 73aa3a89364fe300d1ce0e708fff88514e9da561 Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski Date: Sat, 5 Jan 2019 20:11:54 +0000 Subject: [PATCH] Revert "D56064: More tolerance for flaky tests in libc++ on NetBSD" Requested by EricWF. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@350477 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/libcxx/test/format.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/utils/libcxx/test/format.py b/utils/libcxx/test/format.py index 46b2e46ac..6a334ac31 100644 --- a/utils/libcxx/test/format.py +++ b/utils/libcxx/test/format.py @@ -12,7 +12,6 @@ import errno import os import time import random -import platform import lit.Test # pylint: disable=import-error import lit.TestRunner # pylint: disable=import-error @@ -203,12 +202,6 @@ class LibcxxTestFormat(object): for f in os.listdir(local_cwd) if f.endswith('.dat')] is_flaky = self._get_parser('FLAKY_TEST.', parsers).getValue() max_retry = 3 if is_flaky else 1 - - # LIBC++ tests tend to be more flaky on NetBSD, so add more retries. - # We don't do this on other platforms because it's slower. - if platform.system() in ['NetBSD']: - max_retry = max_retry * 3 - for retry_count in range(max_retry): cmd, out, err, rc = self.executor.run(exec_path, [exec_path], local_cwd, data_files,