Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Win egs_system function #508

Merged
merged 1 commit into from
Mar 7, 2019
Merged

Fix Win egs_system function #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions HEN_HOUSE/gui/egs_configure/egs_tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1744,6 +1744,15 @@ void MTest::execute(){
if ( exeTimes < args.count() ){
QStringList the_arg; the_arg << QString( args[exeTimes] );
QString command = QString("./") + t[currentTask].exeName();

QString criterion = t[currentTask].checkMode();
if ( criterion.toLower() == "exitstatus"){
exeProc->setProcessChannelMode(QProcess::MergedChannels);
}
else if ( criterion.toLower() == "output"){
exeProc->setProcessChannelMode(QProcess::SeparateChannels);
}

exeProc->start(command,the_arg);
if(exeProc->error()==QProcess::FailedToStart){
//if ( ! exeProc->start() ) {
Expand Down
4 changes: 2 additions & 2 deletions HEN_HOUSE/pieces/tests_win.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void EGS_EXIT__(int *status){my_exit(status);}
<opt> </opt>
<map>
<key>OUTSTRING</key>
<body>echo hallo</body>
<body>echo off</body> <!-- parse only test output using silent cmd -->
<body>blah__blah</body>
</map>
<arg>0</arg>
Expand All @@ -190,7 +190,7 @@ void EGS_EXIT__(int *status){my_exit(status);}
do i=1,len(command)
command(i:i) = ' '
end do
command = 'echo hallo'
command = 'echo off' <!-- parse only test output using silent cmd -->
command(11:11) = char(0)
istat = 222222
call system(command,istat)
Expand Down