Giacomo Travaglini has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/30574 )
Change subject: ext: TestStdout and TestStderr
......................................................................
ext: TestStdout and TestStderr
This is actually not used
JIRA: https://gem5.atlassian.net/projects/GEM5/issues/GEM5-533
Change-Id: Ic2be44daf26fed4236647bca3f2e82ca950d7656
Signed-off-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
---
M ext/testlib/handlers.py
M ext/testlib/log.py
2 files changed, 0 insertions(+), 65 deletions(-)
diff --git a/ext/testlib/handlers.py b/ext/testlib/handlers.py
index 723a855..c8eab4c 100644
--- a/ext/testlib/handlers.py
+++ b/ext/testlib/handlers.py
@@ -49,43 +49,6 @@
from six.moves import queue as Queue
from testlib.configuration import constants
-
-class _TestStreamManager(object):
- def __init__(self):
- self._writers = {}
-
- def open_writer(self, test_result):
- if test_result in self._writers:
- raise ValueError('Cannot have multiple writters on a single
test.')
- self._writers[test_result] = _TestStreams(test_result.stdout,
- test_result.stderr)
-
- def get_writer(self, test_result):
- if test_result not in self._writers:
- self.open_writer(test_result)
- return self._writers[test_result]
-
- def close_writer(self, test_result):
- if test_result in self._writers:
- writer = self._writers.pop(test_result)
- writer.close()
-
- def close(self):
- for writer in self._writers.values():
- writer.close()
- self._writers.clear()
-
-class _TestStreams(object):
- def __init__(self, stdout, stderr):
- helper.mkdir_p(os.path.dirname(stdout))
- helper.mkdir_p(os.path.dirname(stderr))
- self.stdout = open(stdout, 'w')
- self.stderr = open(stderr, 'w')
-
- def close(self):
- self.stdout.close()
- self.stderr.close()
-
class ResultHandler(object):
'''
Log handler which listens for test results and output saving data as
@@ -113,9 +76,6 @@
log.SuiteResult.type_id: self.handle_suite_result,
log.TestResult.type_id: self.handle_test_result,
-
- log.TestStderr.type_id: self.handle_stderr,
- log.TestStdout.type_id: self.handle_stdout,
}
def handle(self, record):
@@ -135,16 +95,6 @@
test_result = self._get_test_result(record)
test_result.result = record['result']
- def handle_stderr(self, record):
- self.test_stream_manager.get_writer(
- self._get_test_result(record)
- ).stderr.write(record['buffer'])
-
- def handle_stdout(self, record):
- self.test_stream_manager.get_writer(
- self._get_test_result(record)
- ).stdout.write(record['buffer'])
-
def _get_test_result(self, test_record):
return self.internal_results.get_test_result(
test_record['metadata'].uid,
@@ -263,8 +213,6 @@
log.TestResult.type_id: self.handle_testresult,
log.SuiteStatus.type_id: self.handle_suitestatus,
log.TestStatus.type_id: self.handle_teststatus,
- log.TestStderr.type_id: self.handle_stderr,
- log.TestStdout.type_id: self.handle_stdout,
log.TestMessage.type_id: self.handle_testmessage,
log.LibraryMessage.type_id: self.handle_librarymessage,
}
@@ -298,14 +246,6 @@
log.test_log.debug('Starting Test Suite: %s ' %\
record['metadata'].name)
- def handle_stderr(self, record):
- if self.stream:
- print(record.data['buffer'], file=sys.stderr, end='')
-
- def handle_stdout(self, record):
- if self.stream:
- print(record.data['buffer'], file=sys.stdout, end='')
-
def handle_testmessage(self, record):
if self.stream:
print(self._colorize(record['message'], record['level']))
diff --git a/ext/testlib/log.py b/ext/testlib/log.py
index 1bdb373..0c19928 100644
--- a/ext/testlib/log.py
+++ b/ext/testlib/log.py
@@ -97,11 +97,6 @@
pass
class LibraryResult(ResultRecord):
pass
-# Test Output Types
-class TestStderr(Record):
- pass
-class TestStdout(Record):
- pass
# Message (Raw String) Types
class TestMessage(Record):
pass
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/30574
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ic2be44daf26fed4236647bca3f2e82ca950d7656
Gerrit-Change-Number: 30574
Gerrit-PatchSet: 1
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
