Run test 2 during make test.
Implement #ifdef nesting in tools/build/gen-cat.pl.
Use more of the setting, pass more tests.