| 1 | diff -u -r ../fish-2.2.0/fish_tests.cpp ./fish_tests.cpp |
| 2 | --- ../fish-2.2.0/fish_tests.cpp 2015-07-03 15:46:59.000000000 -0400 |
| 3 | +++ ./src/fish_tests.cpp 2015-07-13 02:17:00.378612789 -0400 |
| 4 | @@ -2572,9 +2572,11 @@ |
| 5 | assert(0 && "strategy_default should be passed"); |
| 6 | break; |
| 7 | |
| 8 | +#ifndef __ANDROID__ |
| 9 | case universal_notifier_t::strategy_shmem_polling: |
| 10 | // nothing required |
| 11 | break; |
| 12 | +#endif |
| 13 | |
| 14 | case universal_notifier_t::strategy_notifyd: |
| 15 | // notifyd requires a round trip to the notifyd server, which means we have to wait a little bit to receive it |
| 16 | @@ -2666,7 +2668,9 @@ |
| 17 | static void test_universal_notifiers() |
| 18 | { |
| 19 | if (system("mkdir -p /tmp/fish_uvars_test/ && touch /tmp/fish_uvars_test/varsfile.txt")) err(L"mkdir failed"); |
| 20 | +#ifndef __ANDROID__ |
| 21 | test_notifiers_with_strategy(universal_notifier_t::strategy_shmem_polling); |
| 22 | +#endif |
| 23 | test_notifiers_with_strategy(universal_notifier_t::strategy_named_pipe); |
| 24 | #if __APPLE__ |
| 25 | test_notifiers_with_strategy(universal_notifier_t::strategy_notifyd); |