Merge "Fix failing Libcore benchmarks."
This commit is contained in:
@@ -1,61 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2022 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package android.libcore.regression;
|
|
||||||
|
|
||||||
import android.perftests.utils.BenchmarkState;
|
|
||||||
import android.perftests.utils.PerfStatusReporter;
|
|
||||||
import android.test.suitebuilder.annotation.LargeTest;
|
|
||||||
|
|
||||||
import org.junit.Rule;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.junit.runners.Parameterized;
|
|
||||||
import org.junit.runners.Parameterized.Parameters;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.jar.JarFile;
|
|
||||||
import java.util.jar.Manifest;
|
|
||||||
|
|
||||||
@RunWith(Parameterized.class)
|
|
||||||
@LargeTest
|
|
||||||
public class JarFilePerfTest {
|
|
||||||
@Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
|
|
||||||
|
|
||||||
@Parameters(name = "mFilename={0}")
|
|
||||||
public static Collection<Object[]> data() {
|
|
||||||
return Arrays.asList(
|
|
||||||
new Object[][] {
|
|
||||||
{"/system/framework/core-oj.jar"}, {"/system/priv-app/Phonesky/Phonesky.apk"}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Parameterized.Parameter(0)
|
|
||||||
public String mFilename;
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void time() throws Exception {
|
|
||||||
File f = new File(mFilename);
|
|
||||||
BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
|
|
||||||
while (state.keepRunning()) {
|
|
||||||
JarFile jf = new JarFile(f);
|
|
||||||
Manifest m = jf.getManifest();
|
|
||||||
jf.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -51,7 +51,6 @@ public class SignaturePerfTest {
|
|||||||
{Algorithm.SHA256WithRSA, Implementation.OpenSSL},
|
{Algorithm.SHA256WithRSA, Implementation.OpenSSL},
|
||||||
{Algorithm.SHA384WithRSA, Implementation.OpenSSL},
|
{Algorithm.SHA384WithRSA, Implementation.OpenSSL},
|
||||||
{Algorithm.SHA512WithRSA, Implementation.OpenSSL},
|
{Algorithm.SHA512WithRSA, Implementation.OpenSSL},
|
||||||
{Algorithm.SHA1withDSA, Implementation.OpenSSL},
|
|
||||||
{Algorithm.SHA1withDSA, Implementation.BouncyCastle}
|
{Algorithm.SHA1withDSA, Implementation.BouncyCastle}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user