Make inotify-based universal variable notifier tests pass

This commit is contained in:
ridiculousfish 2014-05-03 19:57:20 -07:00
parent 8cbd66b0f9
commit 7e44bcfd8a
2 changed files with 3 additions and 1 deletions

View file

@ -1665,7 +1665,7 @@ public:
{
struct inotify_event evt = {};
ssize_t read_amt = read(watch_fd, &evt, sizeof evt);
if (read_amt >= sizeof evt)
if (read_amt >= (ssize_t)sizeof evt)
{
if (evt.mask & (IN_DELETE_SELF | IN_MOVE_SELF))
{

View file

@ -2371,7 +2371,9 @@ static void test_universal_notifiers()
test_notifiers_with_strategy(universal_notifier_t::strategy_notifyd);
#endif
#if __linux || linux
if (system("mkdir -p /tmp/fish_uvars_test/ && touch /tmp/fish_uvars_test/varsfile.txt")) err(L"mkdir failed");
test_notifiers_with_strategy(universal_notifier_t::strategy_inotify);
if (system("rm -Rf /tmp/fish_uvars_test/")) err(L"rm failed");
#endif
}