[21.4/SXEmacs] test-harness improvements