jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1779266 - /jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java
Date Tue, 17 Jan 2017 21:06:38 GMT
Author: fschumacher
Date: Tue Jan 17 21:06:38 2017
New Revision: 1779266

URL: http://svn.apache.org/viewvc?rev=1779266&view=rev
Log:
Set JMeterHome in isolated test (instead of relying on AllTests to initialise it).

Modified:
    jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java

Modified: jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java?rev=1779266&r1=1779265&r2=1779266&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java Tue Jan 17
21:06:38 2017
@@ -33,7 +33,10 @@ public class TestCsvSampleWriter {
     @Before
     public void setUp() throws Exception {
         // We have to initialize JMeterUtils
-        JMeterUtils.loadJMeterProperties("jmeter.properties");
+        if (JMeterUtils.getJMeterHome() == null) {
+            JMeterUtils.setJMeterHome(System.getenv("JMETER_HOME"));
+        }
+        JMeterUtils.loadJMeterProperties(JMeterUtils.getJMeterBinDir() + "/jmeter.properties");
     }
 
     SampleMetadata metadata = new SampleMetadata(',', "a", "b");



Mime
View raw message