Remove JobInfoGenerator from this PR
jonawals
5 years ago
parent
e68ac30bcb
commit
f08de28cd8
@ -1,167 +0,0 @@
|
||||
/*
|
||||
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
||||
* its licensors.
|
||||
*
|
||||
* For complete copyright and license terms please see the LICENSE at the root of this
|
||||
* distribution (the "License"). All use of this software is governed by the License,
|
||||
* or, if provided, by the license below or the license accompanying this file. Do not
|
||||
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <Target/TestImpactTestTarget.h>
|
||||
#include <TestEngine/JobRunner/TestImpactTestJobInfoGenerator.h>
|
||||
|
||||
namespace TestImpact
|
||||
{
|
||||
static constexpr char* const standAloneExtension = ".exe"; // these are os specific so move these to the platform dir
|
||||
static constexpr char* const testRunnerExtension = ".dll"; // these are os specific so move these to the platform dir
|
||||
|
||||
// SPLIT INTO COMMAND GENERATOR (INSTRUMENT, RUNNER, ENUM, RESULTS)
|
||||
|
||||
TestJobInfoGenerator::TestJobInfoGenerator(
|
||||
const RepoPath& sourceDir,
|
||||
const RepoPath& targetBinaryDir,
|
||||
const RepoPath& cacheDir,
|
||||
const RepoPath& artifactDir,
|
||||
const RepoPath& testRunnerBinary,
|
||||
const RepoPath& instrumentBinary)
|
||||
: m_sourceDir(sourceDir)
|
||||
, m_targetBinaryDir(targetBinaryDir)
|
||||
, m_cacheDir(cacheDir)
|
||||
, m_artifactDir(artifactDir)
|
||||
, m_testRunnerBinary(testRunnerBinary)
|
||||
, m_instrumentBinary(instrumentBinary)
|
||||
{
|
||||
}
|
||||
|
||||
AZStd::string TestJobInfoGenerator::GenerateLaunchArgument(const TestTarget* testTarget) const
|
||||
{
|
||||
if (testTarget->GetLaunchMethod() == LaunchMethod::StandAlone)
|
||||
{
|
||||
return AZStd::string::format(
|
||||
"%s%s %s",
|
||||
(m_targetBinaryDir / testTarget->GetOutputName()).c_str(),
|
||||
standAloneExtension,
|
||||
testTarget->GetCustomArgs().c_str()).c_str();
|
||||
}
|
||||
else
|
||||
{
|
||||
return AZStd::string::format(
|
||||
"\"%s\" \"%s%s\" %s",
|
||||
m_testRunnerBinary.c_str(),
|
||||
(m_targetBinaryDir / testTarget->GetOutputName()).c_str(),
|
||||
testRunnerExtension,
|
||||
testTarget->GetCustomArgs().c_str()).c_str();
|
||||
}
|
||||
}
|
||||
|
||||
RepoPath TestJobInfoGenerator::GenerateTargetEnumerationCacheFilePath(const TestTarget* testTarget) const
|
||||
{
|
||||
return AZStd::string::format("%s.cache", (m_artifactDir / testTarget->GetName()).c_str());
|
||||
}
|
||||
|
||||
RepoPath TestJobInfoGenerator::GenerateTargetEnumerationArtifactFilePath(const TestTarget* testTarget) const
|
||||
{
|
||||
return AZStd::string::format("%s.Enumeration.xml", (m_artifactDir / testTarget->GetName()).c_str());
|
||||
}
|
||||
|
||||
RepoPath TestJobInfoGenerator::GenerateTargetRunArtifactFilePath(const TestTarget* testTarget) const
|
||||
{
|
||||
return AZStd::string::format("%s.Run.xml", (m_artifactDir / testTarget->GetName()).c_str());
|
||||
}
|
||||
|
||||
RepoPath TestJobInfoGenerator::GenerateTargetCoverageArtifactFilePath(const TestTarget* testTarget) const
|
||||
{
|
||||
return AZStd::string::format("%s.Coverage.xml", (m_artifactDir / testTarget->GetName()).c_str());
|
||||
}
|
||||
|
||||
const RepoPath& TestJobInfoGenerator::GetCacheDir() const
|
||||
{
|
||||
return m_cacheDir;
|
||||
}
|
||||
|
||||
const RepoPath& TestJobInfoGenerator::GetArtifactDir() const
|
||||
{
|
||||
return m_artifactDir;
|
||||
}
|
||||
|
||||
TestEnumerator::JobInfo TestJobInfoGenerator::GenerateTestEnumerationJobInfo(
|
||||
const TestTarget* testTarget,
|
||||
TestEnumerator::JobInfo::Id jobId,
|
||||
TestEnumerator::JobInfo::CachePolicy cachePolicy) const
|
||||
{
|
||||
using Command = TestEnumerator::Command;
|
||||
using JobInfo = TestEnumerator::JobInfo;
|
||||
using JobData = TestEnumerator::JobData;
|
||||
using Cache = TestEnumerator::JobData::Cache;
|
||||
|
||||
const auto enumerationArtifact = GenerateTargetEnumerationArtifactFilePath(testTarget);
|
||||
const Command args =
|
||||
{
|
||||
AZStd::string::format(
|
||||
"%s --gtest_list_tests --gtest_output=xml:\"%s\"",
|
||||
GenerateLaunchArgument(testTarget).c_str(),
|
||||
enumerationArtifact.c_str())
|
||||
};
|
||||
|
||||
return JobInfo(jobId, args, JobData(enumerationArtifact, Cache{ cachePolicy, GenerateTargetEnumerationCacheFilePath(testTarget) }));
|
||||
}
|
||||
|
||||
TestRunner::JobInfo TestJobInfoGenerator::GenerateRegularTestRunJobInfo(
|
||||
const TestTarget* testTarget,
|
||||
TestRunner::JobInfo::Id jobId) const
|
||||
{
|
||||
using Command = TestRunner::Command;
|
||||
using JobInfo = TestRunner::JobInfo;
|
||||
using JobData = TestRunner::JobData;
|
||||
|
||||
const auto runArtifact = GenerateTargetRunArtifactFilePath(testTarget);
|
||||
const Command args =
|
||||
{
|
||||
AZStd::string::format(
|
||||
"%s --gtest_output=xml:\"%s\"",
|
||||
GenerateLaunchArgument(testTarget).c_str(),
|
||||
runArtifact.c_str())
|
||||
};
|
||||
|
||||
return JobInfo(jobId, args, JobData(runArtifact));
|
||||
}
|
||||
|
||||
InstrumentedTestRunner::JobInfo TestJobInfoGenerator::GenerateInstrumentedTestRunJobInfo(
|
||||
const TestTarget* testTarget,
|
||||
InstrumentedTestRunner::JobInfo::Id jobId,
|
||||
CoverageLevel coverageLevel) const
|
||||
{
|
||||
using Command = InstrumentedTestRunner::Command;
|
||||
using JobInfo = InstrumentedTestRunner::JobInfo;
|
||||
using JobData = InstrumentedTestRunner::JobData;
|
||||
|
||||
const auto coverageArtifact = GenerateTargetCoverageArtifactFilePath(testTarget);
|
||||
const auto runArtifact = GenerateTargetRunArtifactFilePath(testTarget);
|
||||
const Command args =
|
||||
{
|
||||
AZStd::string::format(
|
||||
"\"%s\" " // 1. Instrumented test runner
|
||||
"--coverage_level %s " // 2. Coverage level
|
||||
"--export_type cobertura:\"%s\" " // 3. Test coverage artifact path
|
||||
"--modules \"%s\" " // 4. Modules path
|
||||
"--excluded_modules \"%s\" " // 5. Exclude modules
|
||||
"--sources \"%s\" -- " // 6. Sources path
|
||||
"%s " // 7. Launch command
|
||||
"--gtest_output=xml:\"%s\"", // 8. Result artifact
|
||||
|
||||
m_instrumentBinary.c_str(), // 1. Instrumented test runner
|
||||
(coverageLevel == CoverageLevel::Line ? "line" : "source"), // 2. Coverage level
|
||||
coverageArtifact.c_str(), // 3. Test coverage artifact path
|
||||
m_targetBinaryDir.c_str(), // 4. Modules path
|
||||
m_testRunnerBinary.c_str(), // 5. Exclude modules
|
||||
m_sourceDir.c_str(), // 6. Sources path
|
||||
GenerateLaunchArgument(testTarget).c_str(), // 7. Launch command
|
||||
runArtifact.c_str()) // 8. Result artifact
|
||||
};
|
||||
|
||||
return JobInfo(jobId, args, JobData(runArtifact, coverageArtifact));
|
||||
}
|
||||
}
|
||||
@ -1,67 +0,0 @@
|
||||
/*
|
||||
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
||||
* its licensors.
|
||||
*
|
||||
* For complete copyright and license terms please see the LICENSE at the root of this
|
||||
* distribution (the "License"). All use of this software is governed by the License,
|
||||
* or, if provided, by the license below or the license accompanying this file. Do not
|
||||
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
*
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <TestImpactFramework/TestImpactRuntime.h>
|
||||
|
||||
#include <Artifact/Dynamic/TestImpactCoverage.h>
|
||||
#include <TestEngine/Enumeration/TestImpactTestEnumerator.h>
|
||||
#include <TestEngine/Run/TestImpactInstrumentedTestRunner.h>
|
||||
#include <TestEngine/Run/TestImpactTestRunner.h>
|
||||
|
||||
namespace TestImpact
|
||||
{
|
||||
class TestTarget;
|
||||
|
||||
class TestJobInfoGenerator
|
||||
{
|
||||
public:
|
||||
TestJobInfoGenerator(
|
||||
const RepoPath& sourceDir,
|
||||
const RepoPath& targetBinaryDir,
|
||||
const RepoPath& cacheDir,
|
||||
const RepoPath& artifactDir,
|
||||
const RepoPath& testRunnerBinary,
|
||||
const RepoPath& instrumentBinary);
|
||||
|
||||
const RepoPath& GetCacheDir() const;
|
||||
const RepoPath& GetArtifactDir() const;
|
||||
|
||||
TestEnumerator::JobInfo GenerateTestEnumerationJobInfo(
|
||||
const TestTarget* testTarget,
|
||||
TestEnumerator::JobInfo::Id jobId,
|
||||
TestEnumerator::JobInfo::CachePolicy cachePolicy) const;
|
||||
|
||||
TestRunner::JobInfo GenerateRegularTestRunJobInfo(
|
||||
const TestTarget* testTarget,
|
||||
TestRunner::JobInfo::Id jobId) const;
|
||||
|
||||
InstrumentedTestRunner::JobInfo GenerateInstrumentedTestRunJobInfo(
|
||||
const TestTarget* testTarget,
|
||||
InstrumentedTestRunner::JobInfo::Id jobId,
|
||||
CoverageLevel coverageLevel) const;
|
||||
private:
|
||||
AZStd::string GenerateLaunchArgument(const TestTarget* testTarget) const;
|
||||
RepoPath GenerateTargetEnumerationCacheFilePath(const TestTarget* testTarget) const;
|
||||
RepoPath GenerateTargetEnumerationArtifactFilePath(const TestTarget* testTarget) const;
|
||||
RepoPath GenerateTargetRunArtifactFilePath(const TestTarget* testTarget) const;
|
||||
RepoPath GenerateTargetCoverageArtifactFilePath(const TestTarget* testTarget) const;
|
||||
|
||||
RepoPath m_sourceDir;
|
||||
RepoPath m_targetBinaryDir;
|
||||
RepoPath m_cacheDir;
|
||||
RepoPath m_artifactDir;
|
||||
RepoPath m_testRunnerBinary;
|
||||
RepoPath m_instrumentBinary;
|
||||
};
|
||||
}
|
||||
Loading…
Reference in New Issue