Test sun/tools/jhsdb/SAGetoptTest.java fails after JDK-8299470

The test is failing in our tier 5 CI runs:

----------System.err:(13/787)----------
Unexpected error 'Successor argument without leading - is expected for 'd' but we got '-c''
java.lang.RuntimeException: Bad option test 4 failed
at SAGetoptTest.badOptionsTest(SAGetoptTest.java:124)
at SAGetoptTest.main(SAGetoptTest.java:149)
at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104)
at java.base/java.lang.reflect.Method.invoke(Method.java:578)
at com.sun.javatest.regtest.agent.MainWrapper$MainThread.run(MainWrapper.java:125)
at java.base/java.lang.Thread.run(Thread.java:1623)

JavaTest Message: Test threw exception: java.lang.RuntimeException: Bad option test 4 failed
JavaTest Message: shutting down test