Conditional test directories.
reset make.inc and make.define
Merge branch 'next' into gpu

Conflicts:
	tests/tests/Makefile