Skip to content

Commit 9a94a6c

Browse files
committed
Remove stray line break when running root -q with input files
ROOT first prints a newline before going over the inputs to separate printouts from the initial "root [0]" prompt. But if root is run with "-q", there is no prompt and we don't need the newline. Removing this spurious newline completely avoids all output when building ROOT, where the newline used to happen when running `hsimple.C`. This is commit is similar to 8e8b6bb, which removed another stray linebreak in the opposite case of running `root` with no input files.
1 parent 6373765 commit 9a94a6c

File tree

871 files changed

+10
-870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

871 files changed

+10
-870
lines changed

README/ReleaseNotes/v640/index.md

Lines changed: 6 additions & 0 deletions

core/rint/src/TRint.cxx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,10 @@ void TRint::Run(Bool_t retrn)
430430
}
431431
TObjString *file = (TObjString *)fileObj;
432432
char cmd[kMAXPATHLEN+50];
433-
if (!fNcmd)
433+
// First print a newline before going over the inputs to separate
434+
// printouts from the initial "root [0]" prompt. If root is run
435+
// with "-q", there is no prompt and we don't need the newline.
436+
if (!fNcmd && !QuitOpt())
434437
printf("\n");
435438
Bool_t rootfile = kFALSE;
436439

roottest/cling/array/array1test.ref

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Processing runarray1test.C...
32
a1 is
43
a2 is
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
21
Processing runarrayhist.C...

roottest/cling/bytecode/complex.ref

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Processing runcomplex.C...
32
x = -1
43
x = -1

roottest/cling/bytecode/henry.ref

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Processing runhenry.C...
32
initial chi2/Ndf: 528.202
43
Chi2/Ndf 528.202

roottest/cling/const/good1.output

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Processing runConst.C...
32
with const MyClass4*
43
with MyClass4*

roottest/cling/const/good2.output

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Processing runConst.C+...
32
with const MyClass4*
43
with MyClass4*
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Processing runLoopbreak.C...
32
in loop, i=1
43
after loop, i=1
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
21
Processing /Users/pcanal/root_working/roottest/cling/dict/ROOT-8096/load.C...
32
(int) 0

0 commit comments

Comments
 (0)