Skip to content

Commit c38a5d1

Browse files
committed
Revert "slightly more detailed cmdmsg"
This reverts commit 3b285a1024f3115a6af6da1b0d7d637548a0bf1c.
1 parent 4bb21ec commit c38a5d1

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

flang/runtime/execute.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ int TerminationCheck(int status, const Descriptor *cmdstat,
7676
"Invalid command quit with exit status code: %d", exitStatusVal);
7777
} else {
7878
StoreIntToDescriptor(cmdstat, INVALID_CL_ERR, terminator);
79-
CheckAndCopyCharsToDescriptor(cmdmsg,
80-
"Invalid command line: check for exitstat and console printout");
79+
CheckAndCopyCharsToDescriptor(cmdmsg, "Invalid command line");
8180
}
8281
}
8382
if (status == -1) {

flang/unittests/Runtime/CommandTest.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,7 @@ TEST_F(ZeroArguments, ECLInvalidCommandErrorSync) {
344344
bool wait{true};
345345
OwningPtr<Descriptor> exitStat{IntDescriptor(404)};
346346
OwningPtr<Descriptor> cmdStat{IntDescriptor(202)};
347-
OwningPtr<Descriptor> cmdMsg{CharDescriptor(
348-
"cmdmsg will not modify the remaining buffer XXXXXXXXXXXXXXXXXXXXX")};
347+
OwningPtr<Descriptor> cmdMsg{CharDescriptor("Message ChangedXXXXXXXXX")};
349348

350349
RTNAME(ExecuteCommandLine)
351350
(*command.get(), wait, exitStat.get(), cmdStat.get(), cmdMsg.get());
@@ -355,8 +354,7 @@ TEST_F(ZeroArguments, ECLInvalidCommandErrorSync) {
355354
CheckDescriptorEqInt<std::int64_t>(exitStat.get(), 127);
356355
#endif
357356
CheckDescriptorEqInt<std::int64_t>(cmdStat.get(), 3);
358-
CheckDescriptorEqStr(cmdMsg.get(),
359-
"Invalid command line: check for exitstat and console printoutXXXX");
357+
CheckDescriptorEqStr(cmdMsg.get(), "Invalid command lineXXXX");
360358
}
361359

362360
TEST_F(ZeroArguments, ECLInvalidCommandTerminatedSync) {

0 commit comments

Comments
 (0)