mirror of
https://github.com/openjdk/jdk.git
synced 2026-05-15 16:09:44 +00:00
Merge
This commit is contained in:
commit
cd51ca39ff
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -258,6 +258,11 @@ jdk_% core_% svc_%:
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
# When called from JPRT the TESTDIRS variable is set to the jtreg tests to run
|
||||
ifdef TESTDIRS
|
||||
TEST_SELECTION = $(TESTDIRS)
|
||||
endif
|
||||
|
||||
ifdef CONCURRENCY
|
||||
EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
|
||||
endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user