Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: clean up the last of the empty directories #467

Merged
merged 1 commit into from
Jun 16, 2022
Merged

tests: clean up the last of the empty directories #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions tests/check_ipc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,15 +1598,18 @@ test_ipc_stress_connections(void)
}
multiple_connections = QB_FALSE;

request_server_exit();
verify_graceful_stop(pid);
qb_ipcc_disconnect(conn);

/* Re-enable logging here so we get the "Free'ing" message which allows
for resources.test to clear up after us if needed */
qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_CLEAR_ALL,
QB_LOG_FILTER_FILE, "*", LOG_TRACE);
qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD,
QB_LOG_FILTER_FILE, "*", LOG_TRACE);
qb_log_ctl(QB_LOG_STDERR, QB_LOG_CONF_ENABLED, QB_TRUE);

request_server_exit();
qb_ipcc_disconnect(conn);
verify_graceful_stop(pid);

}

static void
Expand Down
9 changes: 9 additions & 0 deletions tests/resources.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ for d in /dev/shm /var/run $SOCKETDIR; do
RETURN=1
fi
done

# Clean up empty /dev/shm directories left over by some tests
DIRS=$(grep "Free'ing ringbuffer" ipc.log ipc_sock.log| cut -f4 -d ' '|cut -f-4 -d'/'|sort|uniq)
for i in $DIRS
do
rmdir $i 2>/dev/null
done


ps aux | grep -v grep | grep -E 'lt-.*\.test'
if [ $? -eq 0 ]; then
echo "test program frozen"
Expand Down