Skip to content

Commit 760cf39

Browse files
committed
TestSuite: sync stderr to stdout for ADB.
It's extremely out of sync otherwise.
1 parent 0a08374 commit 760cf39

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

doc/corrade-changelog.dox

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ namespace Corrade {
7777
executable is kept in `/data/local/tmp` so it's possible to debug it
7878
manually later. See the @ref TestSuite-Tester-running-cmake "Android testing docs"
7979
for more information.
80+
- Android tests ran through CTest have stderr redirected to stdout because
81+
otherwise the `adb` bridge causes them to be extremely out-of-sync
8082

8183
@subsection corrade-changelog-latest-buildsystem Build system
8284

src/Corrade/TestSuite/AdbRunner.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ for file in "$@"; do
8383
done
8484

8585
# No comment. http://web.archive.org/web/20160806094132/https://code.google.com/p/android/issues/detail?id=3254
86-
adb shell 'cd '$remote_tmpdir' && '$test_env' ./'$filename_and_args'; echo -n ADB_IS_SHIT:$?' | tee $tmpdir/adb.retval | grep -v ADB_IS_SHIT
86+
adb shell 'cd '$remote_tmpdir' && '$test_env' ./'$filename_and_args' 2>&1; echo -n ADB_IS_SHIT:$?' | tee $tmpdir/adb.retval | grep -v ADB_IS_SHIT
8787
returncode=$(grep ADB_IS_SHIT $tmpdir/adb.retval | cut -d':' -f2)
8888

8989
# Clean up after ourselves -- remove the temporary directories both on local

0 commit comments

Comments
 (0)