redo-ifchange regression: if REDO_LOG is not set, assume it's 1.

At some point this got broken during a refactoring. The result was that redo-ifchange, run from the command line (as opposed to inside a .do script) would fail to start the log prettifier.
Screwtapello · Mar 2, 2019 · 8a97b0c · 8a97b0c
1 parent 83bc495
commit 8a97b0c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/redo/env.py b/redo/env.py
@@ -35,7 +35,7 @@ def __init__(self):
         self.VERBOSE = _get_bool('REDO_VERBOSE', '')
         self.XTRACE = _get_bool('REDO_XTRACE', '')
         self.KEEP_GOING = _get_bool('REDO_KEEP_GOING', '')
-        self.LOG = _get_int('REDO_LOG', '')
+        self.LOG = _get_int('REDO_LOG', '1')
         self.LOG_INODE = _get('REDO_LOG_INODE', '')
         self.COLOR = _get_int('REDO_COLOR', '')
         self.PRETTY = _get_int('REDO_PRETTY', '')

diff --git a/t/100-args/all.do b/t/100-args/all.do
@@ -1,2 +1,2 @@
-redo test.args test2.args passfailtest
+redo test.args test2.args passfailtest noargs/run
 . ../skip-if-minimal-do.sh
diff --git a/t/100-args/clean.do b/t/100-args/clean.do
@@ -1 +1 @@
-rm -f passfail *~ .*~
+rm -f passfail *~ .*~ */*~ */.*~ noargs/all
diff --git a/t/100-args/noargs/all.do b/t/100-args/noargs/all.do
@@ -0,0 +1 @@
+echo RAN >$3
diff --git a/t/100-args/noargs/run.do b/t/100-args/noargs/run.do
@@ -0,0 +1,3 @@
+rm -f all
+redo-ifchange  # should not default to 'all' since not running from top level
+[ ! -e all ] || exit 11
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		rm -f passfail ~ .~
		rm -f passfail ~ .~ /~ /.~ noargs/all