diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-11-10 11:19:25 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-11-16 01:54:33 +0200 |
| commit | 83f8b7c1b10ba3c60d328ce44df1371f5ee4f9de (patch) | |
| tree | de37c17660a67922befb3f6c9a03fb51939e89c4 /mesonbuild/mtest.py | |
| parent | 40a8a3f8fee7baadd181fe82e356d56abc412351 (diff) | |
| download | meson-83f8b7c1b10ba3c60d328ce44df1371f5ee4f9de.zip meson-83f8b7c1b10ba3c60d328ce44df1371f5ee4f9de.tar.gz meson-83f8b7c1b10ba3c60d328ce44df1371f5ee4f9de.tar.bz2 | |
mtest: add an ASCII-only version of the spinner
While the horizontal line and the other pictograms in mtest have an ASCII-only
version, the spinner does not. This causes mtest to fail with a
UnicodeEncodeError exception on non-Unicode locales.
Fixes: #9538
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/mtest.py')
| -rw-r--r-- | mesonbuild/mtest.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 606c891..09a862d 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -477,8 +477,9 @@ class TestFileLogger(TestLogger): class ConsoleLogger(TestLogger): - SPINNER = "\U0001f311\U0001f312\U0001f313\U0001f314" + \ - "\U0001f315\U0001f316\U0001f317\U0001f318" + ASCII_SPINNER = ['..', ':.', '.:'] + SPINNER = ["\U0001f311", "\U0001f312", "\U0001f313", "\U0001f314", + "\U0001f315", "\U0001f316", "\U0001f317", "\U0001f318"] SCISSORS = "\u2700 " HLINE = "\u2015" @@ -506,12 +507,14 @@ class ConsoleLogger(TestLogger): self.output_start = dashes(self.SCISSORS, self.HLINE, self.cols - 2) self.output_end = dashes('', self.HLINE, self.cols - 2) self.sub = self.RTRI + self.spinner = self.SPINNER try: self.output_start.encode(sys.stdout.encoding or 'ascii') except UnicodeEncodeError: self.output_start = dashes('8<', '-', self.cols - 2) self.output_end = dashes('', '-', self.cols - 2) self.sub = '| ' + self.spinner = self.ASCII_SPINNER def flush(self) -> None: if self.should_erase_line: @@ -536,8 +539,8 @@ class ConsoleLogger(TestLogger): count = '{}-{}/{}'.format(self.started_tests - len(self.running_tests) + 1, self.started_tests, self.test_count) - left = '[{}] {} '.format(count, self.SPINNER[self.spinner_index]) - self.spinner_index = (self.spinner_index + 1) % len(self.SPINNER) + left = '[{}] {} '.format(count, self.spinner[self.spinner_index]) + self.spinner_index = (self.spinner_index + 1) % len(self.spinner) right = '{spaces} {dur:{durlen}}'.format( spaces=' ' * TestResult.maxlen(), |