diff --git a/.gitignore b/.gitignore index d8b381203b6a00..e12e4eab6a1700 100644 --- a/.gitignore +++ b/.gitignore @@ -107,7 +107,6 @@ deps/npm/node_modules/.bin/ /SHASUMS*.txt* # test artifacts -tools/faketime tools/remark-cli/node_modules tools/remark-preset-lint-node/node_modules icu_config.gypi diff --git a/Makefile b/Makefile index a76c04b4993b13..351deca594fc66 100644 --- a/Makefile +++ b/Makefile @@ -531,13 +531,6 @@ test-addons-clean: $(RM) test/addons/.buildstamp test/addons/.docbuildstamp $(MAKE) test-addons-napi-clean -test-timers: - $(MAKE) --directory=tools faketime - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) timers - -test-timers-clean: - $(MAKE) --directory=tools clean - test-async-hooks: $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) async-hooks diff --git a/test/timers/test-timers-reliability.js b/test/timers/test-timers-reliability.js deleted file mode 100644 index 96986a74a6313c..00000000000000 --- a/test/timers/test-timers-reliability.js +++ /dev/null @@ -1,54 +0,0 @@ -'use strict'; -// FaketimeFlags: --exclude-monotonic -f '2014-07-21 09:00:00' - -require('../common'); - -const Timer = process.binding('timer_wrap').Timer; -const assert = require('assert'); - -let timerFired = false; -let intervalFired = false; - -/* - * This test case aims at making sure that timing utilities such - * as setTimeout and setInterval are not vulnerable to time - * drifting or inconsistent time changes (such as ntp time sync - * in the past, etc.). - * - * It is run using faketime so that we change how - * non-monotonic clocks perceive time movement. We freeze - * non-monotonic time, and check if setTimeout and setInterval - * work properly in that situation. - * - * We check this by setting a timer based on a monotonic clock - * to fire after setTimeout's callback is supposed to be called. - * This monotonic timer, by definition, is not subject to time drifting - * and inconsistent time changes, so it can be considered as a solid - * reference. - * - * When the monotonic timer fires, if the setTimeout's callback - * hasn't been called yet, it means that setTimeout's underlying timer - * is vulnerable to time drift or inconsistent time changes. - */ - -const monoTimer = new Timer(); -monoTimer[Timer.kOnTimeout] = function() { - /* - * Make sure that setTimeout's and setInterval's callbacks have - * already fired, otherwise it means that they are vulnerable to - * time drifting or inconsistent time changes. - */ - assert(timerFired); - assert(intervalFired); -}; - -monoTimer.start(300); - -setTimeout(function() { - timerFired = true; -}, 200); - -const interval = setInterval(function() { - intervalFired = true; - clearInterval(interval); -}, 200); diff --git a/test/timers/testcfg.py b/test/timers/testcfg.py deleted file mode 100644 index b766db16910cc5..00000000000000 --- a/test/timers/testcfg.py +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 2008 the V8 project authors. All rights reserved. -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# 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. - -import test -import os -from os.path import join, exists -import re -import shlex - -FAKETIME_FLAGS_PATTERN = re.compile(r"//\s+FaketimeFlags:(.*)") -FAKETIME_BIN_PATH = os.path.join("tools", "faketime", "src", "faketime") - -class TimersTestCase(test.TestCase): - - def __init__(self, path, file, arch, mode, context, config): - super(TimersTestCase, self).__init__(context, path, arch, mode) - self.file = file - self.config = config - self.arch = arch - self.mode = mode - - def GetLabel(self): - return "%s %s" % (self.mode, self.GetName()) - - def GetName(self): - return self.path[-1] - - def GetCommand(self): - result = [FAKETIME_BIN_PATH]; - - source = open(self.file).read() - faketime_flags_match = FAKETIME_FLAGS_PATTERN.search(source) - if faketime_flags_match: - result += shlex.split(faketime_flags_match.group(1).strip()) - - result += [self.config.context.GetVm(self.arch, self.mode)] - result += [self.file] - - return result - - def GetSource(self): - return open(self.file).read() - - -class TimersTestConfiguration(test.TestConfiguration): - - def __init__(self, context, root): - super(TimersTestConfiguration, self).__init__(context, root) - - def Ls(self, path): - def SelectTest(name): - return name.startswith('test-') and name.endswith('.js') - return [f[:-3] for f in os.listdir(path) if SelectTest(f)] - - def ListTests(self, current_path, path, arch, mode): - all_tests = [current_path + [t] for t in self.Ls(join(self.root))] - result = [] - for test in all_tests: - if self.Contains(path, test): - file_path = join(self.root, reduce(join, test[1:], "") + ".js") - result.append(TimersTestCase(test, file_path, arch, mode, - self.context, self)) - return result - - def GetBuildRequirements(self): - return ['sample', 'sample=shell'] - - def GetTestStatus(self, sections, defs): - status_file = join(self.root, 'simple.status') - if exists(status_file): - test.ReadConfigurationInto(status_file, sections, defs) - - - -def GetConfiguration(context, root): - return TimersTestConfiguration(context, root) diff --git a/tools/Makefile b/tools/Makefile deleted file mode 100644 index d627c149d6748e..00000000000000 --- a/tools/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -FAKETIME_REPO := git://github.com/wolfcw/libfaketime.git -FAKETIME_LOCAL_REPO := $(CURDIR)/faketime -FAKETIME_BRANCH := master -FAKETIME_BINARY := $(FAKETIME_PREFIX)/bin/faketime - -.PHONY: faketime - -faketime: $(FAKETIME_BINARY) - -clean: - $(RM) -r $(FAKETIME_LOCAL_REPO) - -$(FAKETIME_BINARY): $(FAKETIME_LOCAL_REPO) - cd $(FAKETIME_LOCAL_REPO) && \ - git checkout $(FAKETIME_BRANCH) && \ - PREFIX=$(FAKETIME_LOCAL_REPO)/src make - -$(FAKETIME_LOCAL_REPO): - git clone $(FAKETIME_REPO) $(FAKETIME_LOCAL_REPO) -