Author: [email protected] Date: Mon Mar 28 09:57:34 2011 New Revision: 900 Log: [AMDATU-332] Linux support
Modified: trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/analysis/JMeterPlanReport.java trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/JMeterRunner.java trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/TestContext.java Modified: trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/analysis/JMeterPlanReport.java ============================================================================== --- trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/analysis/JMeterPlanReport.java (original) +++ trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/analysis/JMeterPlanReport.java Mon Mar 28 09:57:34 2011 @@ -1,3 +1,19 @@ +/* + Copyright (C) 2010 Amdatu.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ package org.amdatu.test.performance.analysis; import java.util.ArrayList; Modified: trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java ============================================================================== --- trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java (original) +++ trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java Mon Mar 28 09:57:34 2011 @@ -1,3 +1,19 @@ +/* + Copyright (C) 2010 Amdatu.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ package org.amdatu.test.performance.runtest; import java.io.File; Modified: trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/JMeterRunner.java ============================================================================== --- trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/JMeterRunner.java (original) +++ trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/JMeterRunner.java Mon Mar 28 09:57:34 2011 @@ -65,9 +65,15 @@ String sampleName = jmeterPlan.getName().replace(".jmx", "") + m_context.getSamplesPostFix()+ "." + m_context.currentContextName; m_sampleFile = new File(resultDir, sampleName); List<String> command = new ArrayList<String>(); - command.add("cmd.exe"); - command.add("/C"); - command.add("jmeter"); + String os = System.getProperty("os.name"); + if (os.indexOf("Windows") != -1) { + command.add("cmd.exe"); + command.add("/C"); + command.add("jmeter"); + } else { + command.add("jmeter.sh"); + } + command.add("-n"); // Non-GUI mode command.add("-t"); command.add(jmeterPlan.getAbsolutePath()); Modified: trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/TestContext.java ============================================================================== --- trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/TestContext.java (original) +++ trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/TestContext.java Mon Mar 28 09:57:34 2011 @@ -1,3 +1,19 @@ +/* + Copyright (C) 2010 Amdatu.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ package org.amdatu.test.performance.runtest; import java.io.File; _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
