7165b342f5
redo-log should log to stdout, because when you ask for the specific logs from a run, the logs are the output you requested. redo-log's stderr should be about any errors retrieving that output. On the other hand, when you run redo, the logs are literally the stderr of the build steps, which are incidental to the main job (building things). So that should be send to stderr. Previously, we were sending to stderr when --no-log, but stdout when --log, which is totally wrong. Also, adding redo-log had the unexpected result that if a .do script redirected the stderr of a sub-redo or redo-ifchange to a file or pipe, the output would be eaten by redo-log instead of the intended output. So a test runner like this: self.test: redo self.runtest 2>&1 | grep ERROR would not work; the self.runtest output would be sent to redo's log buffer (and from there, probably printed to the toplevel redo's stderr) rather than passed along to grep.
46 lines
1.7 KiB
Python
46 lines
1.7 KiB
Python
import os
|
|
from atoi import atoi
|
|
|
|
if not os.environ.get('REDO'):
|
|
import sys
|
|
sys.stderr.write('%s: error: must be run from inside a .do\n'
|
|
% sys.argv[0])
|
|
sys.exit(100)
|
|
|
|
PWD = os.environ.get('REDO_PWD', '')
|
|
TARGET = os.environ.get('REDO_TARGET', '')
|
|
DEPTH = os.environ.get('REDO_DEPTH', '')
|
|
DEBUG = atoi(os.environ.get('REDO_DEBUG', ''))
|
|
DEBUG_LOCKS = os.environ.get('REDO_DEBUG_LOCKS', '') and 1 or 0
|
|
DEBUG_PIDS = os.environ.get('REDO_DEBUG_PIDS', '') and 1 or 0
|
|
VERBOSE = os.environ.get('REDO_VERBOSE', '') and 1 or 0
|
|
XTRACE = os.environ.get('REDO_XTRACE', '') and 1 or 0
|
|
KEEP_GOING = os.environ.get('REDO_KEEP_GOING', '') and 1 or 0
|
|
LOG = atoi(os.environ.get('REDO_LOG', '1')) # defaults on
|
|
LOG_INODE = os.environ.get('REDO_LOG_INODE', '')
|
|
COLOR = atoi(os.environ.get('REDO_COLOR', '1')) # defaults on
|
|
# subprocesses mustn't pretty-print if a parent is running redo-log
|
|
PRETTY = (not LOG) and atoi(os.environ.get('REDO_PRETTY', '1'))
|
|
SHUFFLE = os.environ.get('REDO_SHUFFLE', '') and 1 or 0
|
|
STARTDIR = os.environ.get('REDO_STARTDIR', '')
|
|
RUNID = atoi(os.environ.get('REDO_RUNID')) or None
|
|
BASE = os.environ['REDO_BASE']
|
|
while BASE and BASE.endswith('/'):
|
|
BASE = BASE[:-1]
|
|
|
|
UNLOCKED = os.environ.get('REDO_UNLOCKED', '') and 1 or 0
|
|
os.environ['REDO_UNLOCKED'] = '' # not inheritable by subprocesses
|
|
|
|
NO_OOB = os.environ.get('REDO_NO_OOB', '') and 1 or 0
|
|
os.environ['REDO_NO_OOB'] = '' # not inheritable by subprocesses
|
|
|
|
|
|
def get_locks():
|
|
"""Get the list of held locks."""
|
|
return os.environ.get('REDO_LOCKS', '').split(':')
|
|
|
|
def add_lock(name):
|
|
"""Add a lock to the list of held locks."""
|
|
locks = set(get_locks())
|
|
locks.add(name)
|
|
os.environ['REDO_LOCKS'] = ':'.join(list(locks))
|