Commit 979d64dc authored by Simon Marlow's avatar Simon Marlow

replace dos2unix with sed 's/\r//g'

parent ad6248fe
......@@ -226,16 +226,18 @@ $SpixifyLine1
$TimeCmd /bin/sh -c \'$CachegrindPrefix $ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1.raw 2> $TmpPrefix/runtest$$.2.raw 3> $TmpPrefix/runtest$$.3.raw\'
progexit=\$?
if [ "$StdoutBinary" = "0" ]; then
dos2unix < $TmpPrefix/runtest$$.1.raw > $TmpPrefix/runtest$$.1
# remove Windows \r carraige-returns
sed 's/\r//g' < $TmpPrefix/runtest$$.1.raw > $TmpPrefix/runtest$$.1
else
cp $TmpPrefix/runtest$$.1.raw $TmpPrefix/runtest$$.1
fi
if [ "$StderrBinary" = "0" ]; then
dos2unix < $TmpPrefix/runtest$$.2.raw > $TmpPrefix/runtest$$.2
# remove Windows \r carraige-returns
sed 's/\r//g' < $TmpPrefix/runtest$$.2.raw > $TmpPrefix/runtest$$.2
else
cp $TmpPrefix/runtest$$.2.raw $TmpPrefix/runtest$$.2
fi
dos2unix < $TmpPrefix/runtest$$.3.raw > $TmpPrefix/runtest$$.3
sed 's/\r//g' < $TmpPrefix/runtest$$.3.raw > $TmpPrefix/runtest$$.3
if [ \$progexit -eq 0 ] && [ $PgmFail -ne 0 ]; then
echo $ToRun @PgmArgs \\< $PgmStdinFile
echo "****" expected a failure, but was successful
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment