compiletest: More directive handling tweaks#147934

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

Zalathar:directiveZalathar/rust:directiveCopy head branch name to clipboard