Merge pull request #239 from dicej/misc

fix Misc test failures
This commit is contained in:
Joshua Warner 2014-04-21 19:50:52 -06:00
commit 5beb148df3
2 changed files with 2 additions and 9 deletions

View File

@ -1433,7 +1433,8 @@ endif
class-name = $(patsubst $(1)/%.class,%,$(2))
class-names = $(foreach x,$(2),$(call class-name,$(1),$(x)))
test-flags = -Djava.library.path=$(build) -cp $(build)/test
test-flags = -Djava.library.path=$(build) \
-cp $(build)/test$(target-path-separator)$(build)/extra-dir
test-args = $(test-flags) $(input)

View File

@ -302,14 +302,6 @@ public class Misc {
(new byte[] { 0, 0, 0, 0 },
java.net.InetAddress.getByName("0.0.0.0").getAddress()));
try {
java.net.InetAddress.getByName
("bs.thisdomaindoesntexistseriouslynoway");
throw new AssertionError();
} catch (java.net.UnknownHostException e) {
// cool
}
expect(! staticRan);
Static.run();
expect(staticRan);