Hi!
> +static void cleanup(void)
>  {
> -	/* if it exists, remove the message queue that was created. */
>  	rm_queue(msg_q_1);
>  
> -	tst_rmdir();
> -
> +	msg_q_1 = -1;
Here again, no need to reset the msg_q_1 to -1, otherwise it looks good.
-- 
Cyril Hrubis
chrubis@suse.cz