You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/08/03 11:54:16 UTC
[jmeter] branch master updated (7eeb15d -> 7becdca)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 7eeb15d Use https in docs wherever possible
new 331c6a8 Dislpay stdout for test execution
new 7becdca Add org.gradle:gradle-wrapper to source LICENSE file
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle.kts | 1 +
src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java | 1 -
src/licenses/build.gradle.kts | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
[jmeter] 02/02: Add org.gradle:gradle-wrapper to source LICENSE file
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 7becdca2a7530aec2f89268d24ffc15403120e5f
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Aug 3 14:52:02 2019 +0300
Add org.gradle:gradle-wrapper to source LICENSE file
---
src/licenses/build.gradle.kts | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 44c255d..f7ee004 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -28,6 +28,7 @@ plugins {
}
val gatherSourceLicenses by tasks.registering(GatherLicenseTask::class) {
+ addDependency("org.gradle:gradle-wrapper:5.5.1", SpdxLicense.Apache_2_0)
addDependency(":bootstrap:3.3.4", SpdxLicense.MIT)
addDependency(":bootstrap-social:4.8.0", SpdxLicense.MIT)
addDependency(":datatables:1.10.9", SpdxLicense.MIT)
[jmeter] 01/02: Dislpay stdout for test execution
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 331c6a81dd2235e894fb622fbb1bcf433ee5a082
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Aug 3 14:35:20 2019 +0300
Dislpay stdout for test execution
---
build.gradle.kts | 1 +
src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index ba4b806..2978c1a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -358,6 +358,7 @@ allprojects {
withType<Test>().configureEach {
testLogging {
exceptionFormat = TestExceptionFormat.FULL
+ showStandardStreams = true
}
// Pass the property to tests
systemProperty("java.awt.headless", System.getProperty("java.awt.headless"))
diff --git a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java
index 9f0f746..9b00815 100644
--- a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java
+++ b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java
@@ -38,7 +38,6 @@ public class JMeterTestUtils {
*/
public static String setupJMeterHome() {
if (JMeterUtils.getJMeterProperties() == null) {
- String file = "jmeter.properties";
String prefix = ".";
for (int i = 0; i < 5 && !new File(prefix, "bin/jmeter.properties").canRead(); i++) {
prefix = "../" + prefix;