cl/gcc-adapt-ext: Test suite fixed to run g++ for C++ tests.