merging #2787 server_test.rb fails on `require` when run outside its directory
merging #2815 update `test/build.mk` to not use external make for drivers
Merge branch 'next' into daniel_2832