Skip to content

Commit

Permalink
8287453: RenderPerfTest incorrectly measures performance
Browse files Browse the repository at this point in the history
Reviewed-by: prr
  • Loading branch information
Alexey Ushakov committed Jun 1, 2022
1 parent 0ef3d85 commit 48f19e4
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 444 deletions.
15 changes: 3 additions & 12 deletions test/jdk/performance/client/RenderPerfTest/Makefile
@@ -1,5 +1,6 @@
#
# Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2022, JetBrains s.r.o.. 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
Expand Down Expand Up @@ -28,13 +29,11 @@ DIST=dist
RESOURCES=resources

RENDERPERF_CLASSES = $(CLASSES)/renderperf/RenderPerfTest.class
RENDERPERFLCD_CLASSES = $(CLASSES)/renderperf/RenderPerfLCDTest.class
RENDERPERF_SOURCES = $(SOURCEPATH)/renderperf/RenderPerfTest.java
RENDERPERFLCD_SOURCES = $(SOURCEPATH)/renderperf/RenderPerfLCDTest.java

RENDERPERF_RESOURCES = $(CLASSES)/renderperf/images/duke.png

all: mkdirs $(DIST)/RenderPerfTest.jar $(DIST)/RenderPerfLCDTest.jar
all: mkdirs $(DIST)/RenderPerfTest.jar

run: mkdirs $(DIST)/RenderPerfTest.jar
java -jar $(DIST)/RenderPerfTest.jar
Expand All @@ -44,21 +43,13 @@ $(DIST)/RenderPerfTest.jar: \
$(CLASSES)/renderperf.manifest
jar cvmf $(CLASSES)/renderperf.manifest $(DIST)/RenderPerfTest.jar -C $(CLASSES) .

$(DIST)/RenderPerfLCDTest.jar: \
$(RENDERPERFLCD_CLASSES) $(RENDERPERFLCD_RESOURCES) \
$(CLASSES)/renderperflcd.manifest
jar cvmf $(CLASSES)/renderperflcd.manifest $(DIST)/RenderPerfLCDTest.jar -C $(CLASSES) .

$(CLASSES)/renderperf/images/%: $(RESOURCES)/renderperf/images/%
cp -r $< $@


$(CLASSES)/renderperf.manifest:
echo "Main-Class: renderperf.RenderPerfTest" > $@

$(CLASSES)/renderperflcd.manifest:
echo "Main-Class: renderperf.RenderPerfLCDTest" > $@

$(DIST):
mkdir $(DIST)

Expand Down
3 changes: 2 additions & 1 deletion test/jdk/performance/client/RenderPerfTest/build.xml
@@ -1,5 +1,6 @@
<!--
Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2022, JetBrains s.r.o.. 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
Expand Down

1 comment on commit 48f19e4

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.