Skip to content

Commit 7d40f85

Browse files
committed
Fix 1: ERROR: thisroot.sh, thisroot.csh and thisroot.fish should never be used
1 parent 6bcf2f8 commit 7d40f85

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

root/interpreter/InterpreterTest.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616
static int runTutorial(const std::string& dir, const std::string& filename, const std::string& perffile) {
1717
std::string rootsys = RB::GetRootSys();
1818
std::string rootInvocation;
19-
std::string thisroot = rootsys + "/bin/thisroot.sh";
2019
if (!filename.empty()) {
2120
std::string fullpath = rootsys + "/" + dir + "/" + filename;
22-
// FIXME: no source in /usr/dash
2321
// We are writing /usr/bin/time -v output in file to get maximum resident memory for the benchmark
24-
rootInvocation = "source \"" + thisroot + "\" && /usr/bin/time -v -o \"" + perffile + "\" root.exe -l -q -b -n -x \"" + fullpath + "\" -e return ";
22+
rootInvocation = "/usr/bin/time -v -o \"" + perffile + "\" root.exe -l -q -b -n -x \"" + fullpath + "\" -e return ";
2523
} else {
26-
rootInvocation = "source \"" + thisroot + "\" && /usr/bin/time -v -o \"" + perffile + "\" root.exe -l -q -b ";
24+
rootInvocation = "/usr/bin/time -v -o \"" + perffile + "\" root.exe -l -q -b ";
2725
}
2826

2927
return std::system(rootInvocation.c_str());

0 commit comments

Comments
 (0)