зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset b5bcdacf5837 (bug 1723505) for causing build bustage in GeckoArgs. CLOSED TREE
This commit is contained in:
Sandor Molnar
Родитель
5490902dfc
Коммит
2d2e17d54c
|
|
@ -1,128 +0,0 @@
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
#ifndef mozilla_GeckoArgs_h
|
|
||||||
#define mozilla_GeckoArgs_h
|
|
||||||
|
|
||||||
#include "mozilla/CmdLineAndEnvUtils.h"
|
|
||||||
#include "mozilla/Maybe.h"
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <cctype>
|
|
||||||
#include <climits>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace mozilla {
|
|
||||||
|
|
||||||
namespace geckoargs {
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
struct CommandLineArg {
|
|
||||||
Maybe<T> Get(int& aArgc, char** aArgv,
|
|
||||||
const CheckArgFlag aFlags = CheckArgFlag::RemoveArg);
|
|
||||||
|
|
||||||
const char* Name() { return sName; };
|
|
||||||
|
|
||||||
void Put(std::vector<std::string>& aArgs);
|
|
||||||
void Put(T aValue, std::vector<std::string>& aArgs);
|
|
||||||
|
|
||||||
const char* sName;
|
|
||||||
const char* sMatch;
|
|
||||||
};
|
|
||||||
|
|
||||||
/// Get()
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline Maybe<const char*> CommandLineArg<const char*>::Get(
|
|
||||||
int& aArgc, char** aArgv, const CheckArgFlag aFlags) {
|
|
||||||
MOZ_ASSERT(aArgv, "aArgv must be initialized before CheckArg()");
|
|
||||||
const char* rv = nullptr;
|
|
||||||
if (ARG_FOUND == CheckArg(aArgc, aArgv, sMatch, &rv, aFlags)) {
|
|
||||||
return Some(rv);
|
|
||||||
}
|
|
||||||
return Nothing();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline Maybe<bool> CommandLineArg<bool>::Get(int& aArgc, char** aArgv,
|
|
||||||
const CheckArgFlag aFlags) {
|
|
||||||
MOZ_ASSERT(aArgv, "aArgv must be initialized before CheckArg()");
|
|
||||||
if (ARG_FOUND ==
|
|
||||||
CheckArg(aArgc, aArgv, sMatch, (const char**)nullptr, aFlags)) {
|
|
||||||
return Some(true);
|
|
||||||
}
|
|
||||||
return Nothing();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline Maybe<uint64_t> CommandLineArg<uint64_t>::Get(
|
|
||||||
int& aArgc, char** aArgv, const CheckArgFlag aFlags) {
|
|
||||||
MOZ_ASSERT(aArgv, "aArgv must be initialized before CheckArg()");
|
|
||||||
const char* rv = nullptr;
|
|
||||||
if (ARG_FOUND == CheckArg(aArgc, aArgv, sMatch, &rv, aFlags)) {
|
|
||||||
errno = 0;
|
|
||||||
char* endptr = nullptr;
|
|
||||||
uint64_t conv = std::strtoull(rv, &endptr, 10);
|
|
||||||
if (errno == 0 && endptr && *endptr == '\0') {
|
|
||||||
return Some(conv);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return Nothing();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Put()
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline void CommandLineArg<const char*>::Put(const char* aValue,
|
|
||||||
std::vector<std::string>& aArgs) {
|
|
||||||
aArgs.push_back(Name());
|
|
||||||
aArgs.push_back(aValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline void CommandLineArg<bool>::Put(bool aValue,
|
|
||||||
std::vector<std::string>& aArgs) {
|
|
||||||
if (aValue) {
|
|
||||||
aArgs.push_back(Name());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline void CommandLineArg<bool>::Put(std::vector<std::string>& aArgs) {
|
|
||||||
Put(true, aArgs);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline void CommandLineArg<uint64_t>::Put(uint64_t aValue,
|
|
||||||
std::vector<std::string>& aArgs) {
|
|
||||||
aArgs.push_back(Name());
|
|
||||||
aArgs.push_back(std::to_string(aValue));
|
|
||||||
}
|
|
||||||
|
|
||||||
static CommandLineArg<const char*> sParentBuildID{"-parentBuildID",
|
|
||||||
"parentbuildid"};
|
|
||||||
static CommandLineArg<const char*> sAppDir{"-appDir", "appdir"};
|
|
||||||
static CommandLineArg<const char*> sProfile{"-profile", "profile"};
|
|
||||||
|
|
||||||
static CommandLineArg<uint64_t> sJsInitHandle{"-jsInitHandle", "jsinithandle"};
|
|
||||||
static CommandLineArg<uint64_t> sJsInitLen{"-jsInitLen", "jsinitlen"};
|
|
||||||
static CommandLineArg<uint64_t> sPrefsHandle{"-prefsHandle", "prefshandle"};
|
|
||||||
static CommandLineArg<uint64_t> sPrefsLen{"-prefsLen", "prefslen"};
|
|
||||||
static CommandLineArg<uint64_t> sPrefMapHandle{"-prefMapHandle",
|
|
||||||
"prefmaphandle"};
|
|
||||||
static CommandLineArg<uint64_t> sPrefMapSize{"-prefMapSize", "prefmapsize"};
|
|
||||||
|
|
||||||
static CommandLineArg<uint64_t> sChildID{"-childID", "childid"};
|
|
||||||
|
|
||||||
static CommandLineArg<bool> sSafeMode{"-safeMode", "safemode"};
|
|
||||||
|
|
||||||
static CommandLineArg<bool> sIsForBrowser{"-isForBrowser", "isforbrowser"};
|
|
||||||
static CommandLineArg<bool> sNotForBrowser{"-notForBrowser", "notforbrowser"};
|
|
||||||
|
|
||||||
} // namespace geckoargs
|
|
||||||
|
|
||||||
} // namespace mozilla
|
|
||||||
|
|
||||||
#endif // mozilla_GeckoArgs_h
|
|
||||||
|
|
@ -38,7 +38,6 @@ EXPORTS.mozilla += [
|
||||||
"AutoSQLiteLifetime.h",
|
"AutoSQLiteLifetime.h",
|
||||||
"Bootstrap.h",
|
"Bootstrap.h",
|
||||||
"CmdLineAndEnvUtils.h",
|
"CmdLineAndEnvUtils.h",
|
||||||
"GeckoArgs.h",
|
|
||||||
"MultiInstanceLock.h",
|
"MultiInstanceLock.h",
|
||||||
"SafeMode.h",
|
"SafeMode.h",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -1,176 +0,0 @@
|
||||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
#include "gtest/gtest.h"
|
|
||||||
|
|
||||||
#include "mozilla/ArrayUtils.h"
|
|
||||||
#include "mozilla/GeckoArgs.h"
|
|
||||||
|
|
||||||
using namespace mozilla;
|
|
||||||
using namespace mozilla::geckoargs;
|
|
||||||
|
|
||||||
static CommandLineArg<const char*> kCharParam{"-charParam", "charparam"};
|
|
||||||
static CommandLineArg<uint64_t> kUint64Param{"-Uint64Param", "uint64param"};
|
|
||||||
static CommandLineArg<bool> kFlag{"-Flag", "flag"};
|
|
||||||
|
|
||||||
template <size_t N>
|
|
||||||
bool CheckArgv(char** aArgv, const char* const (&aExpected)[N]) {
|
|
||||||
for (size_t i = 0; i < N; ++i) {
|
|
||||||
if (aArgv[i] == nullptr && aExpected[i] == nullptr) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (strcmp(aArgv[i], aExpected[i]) != 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
char kFirefox[] = "$HOME/bin/firefox/firefox-bin";
|
|
||||||
|
|
||||||
TEST(GeckoArgs, const_char_ptr)
|
|
||||||
{
|
|
||||||
char kCharParamStr[] = "-charParam";
|
|
||||||
char kCharParamValue[] = "paramValue";
|
|
||||||
|
|
||||||
{
|
|
||||||
char* argv[] = {kFirefox, kCharParamStr, kCharParamValue, nullptr};
|
|
||||||
int argc = ArrayLength(argv);
|
|
||||||
EXPECT_EQ(argc, 4);
|
|
||||||
|
|
||||||
Maybe<const char*> charParam = kCharParam.Get(argc, argv);
|
|
||||||
EXPECT_TRUE(charParam.isSome());
|
|
||||||
EXPECT_EQ(*charParam, kCharParamValue);
|
|
||||||
|
|
||||||
const char* const expArgv[] = {kFirefox, nullptr};
|
|
||||||
EXPECT_TRUE(CheckArgv(argv, expArgv));
|
|
||||||
}
|
|
||||||
{
|
|
||||||
char kBlahBlah[] = "-blahblah";
|
|
||||||
char* argv[] = {kFirefox, kCharParamStr, kBlahBlah, nullptr};
|
|
||||||
int argc = ArrayLength(argv);
|
|
||||||
EXPECT_EQ(argc, 4);
|
|
||||||
|
|
||||||
Maybe<const char*> charParam = kCharParam.Get(argc, argv);
|
|
||||||
EXPECT_TRUE(charParam.isNothing());
|
|
||||||
|
|
||||||
const char* const expArgv[] = {kFirefox, kBlahBlah, nullptr};
|
|
||||||
EXPECT_TRUE(CheckArgv(argv, expArgv));
|
|
||||||
}
|
|
||||||
{
|
|
||||||
std::vector<std::string> extraArgs;
|
|
||||||
EXPECT_EQ(extraArgs.size(), 0U);
|
|
||||||
kCharParam.Put("ParamValue", extraArgs);
|
|
||||||
EXPECT_EQ(extraArgs.size(), 2U);
|
|
||||||
EXPECT_EQ(extraArgs[0], "-charParam");
|
|
||||||
EXPECT_EQ(extraArgs[1], "ParamValue");
|
|
||||||
}
|
|
||||||
{ EXPECT_EQ(kCharParam.Name(), "-charParam"); }
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST(GeckoArgs, uint64)
|
|
||||||
{
|
|
||||||
char kUint64ParamStr[] = "-Uint64Param";
|
|
||||||
|
|
||||||
{
|
|
||||||
char* argv[] = {kFirefox, kUint64ParamStr, nullptr};
|
|
||||||
int argc = ArrayLength(argv);
|
|
||||||
EXPECT_EQ(argc, 3);
|
|
||||||
|
|
||||||
Maybe<uint64_t> uint64Param = kUint64Param.Get(argc, argv);
|
|
||||||
EXPECT_TRUE(uint64Param.isNothing());
|
|
||||||
|
|
||||||
const char* const expArgv[] = {kFirefox, nullptr};
|
|
||||||
EXPECT_TRUE(CheckArgv(argv, expArgv));
|
|
||||||
}
|
|
||||||
{
|
|
||||||
char* argv[] = {kFirefox, nullptr};
|
|
||||||
int argc = ArrayLength(argv);
|
|
||||||
EXPECT_EQ(argc, 2);
|
|
||||||
|
|
||||||
Maybe<uint64_t> uint64Param = kUint64Param.Get(argc, argv);
|
|
||||||
EXPECT_TRUE(uint64Param.isNothing());
|
|
||||||
|
|
||||||
const char* const expArgv[] = {kFirefox, nullptr};
|
|
||||||
EXPECT_TRUE(CheckArgv(argv, expArgv));
|
|
||||||
}
|
|
||||||
{
|
|
||||||
char kUint64ParamValue[] = "42";
|
|
||||||
char* argv[] = {kFirefox, kUint64ParamStr, kUint64ParamValue, nullptr};
|
|
||||||
int argc = ArrayLength(argv);
|
|
||||||
EXPECT_EQ(argc, 4);
|
|
||||||
|
|
||||||
Maybe<uint64_t> uint64Param = kUint64Param.Get(argc, argv);
|
|
||||||
EXPECT_TRUE(uint64Param.isSome());
|
|
||||||
EXPECT_EQ(*uint64Param, 42U);
|
|
||||||
|
|
||||||
const char* const expArgv[] = {kFirefox, nullptr};
|
|
||||||
EXPECT_TRUE(CheckArgv(argv, expArgv));
|
|
||||||
}
|
|
||||||
{
|
|
||||||
char kUint64ParamValue[] = "aa";
|
|
||||||
char* argv[] = {kFirefox, kUint64ParamStr, kUint64ParamValue, nullptr};
|
|
||||||
int argc = ArrayLength(argv);
|
|
||||||
EXPECT_EQ(argc, 4);
|
|
||||||
|
|
||||||
Maybe<uint64_t> uint64Param = kUint64Param.Get(argc, argv);
|
|
||||||
EXPECT_TRUE(uint64Param.isNothing());
|
|
||||||
|
|
||||||
const char* const expArgv[] = {kFirefox, nullptr};
|
|
||||||
EXPECT_TRUE(CheckArgv(argv, expArgv));
|
|
||||||
}
|
|
||||||
{
|
|
||||||
std::vector<std::string> extraArgs;
|
|
||||||
EXPECT_EQ(extraArgs.size(), 0U);
|
|
||||||
kUint64Param.Put(1234, extraArgs);
|
|
||||||
EXPECT_EQ(extraArgs.size(), 2U);
|
|
||||||
EXPECT_EQ(extraArgs[0], "-Uint64Param");
|
|
||||||
EXPECT_EQ(extraArgs[1], "1234");
|
|
||||||
}
|
|
||||||
{ EXPECT_EQ(kUint64Param.Name(), "-Uint64Param"); }
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST(GeckoArgs, bool)
|
|
||||||
{
|
|
||||||
char kFlagStr[] = "-Flag";
|
|
||||||
|
|
||||||
{
|
|
||||||
char* argv[] = {kFirefox, kFlagStr, nullptr};
|
|
||||||
int argc = ArrayLength(argv);
|
|
||||||
EXPECT_EQ(argc, 3);
|
|
||||||
|
|
||||||
Maybe<bool> Flag = kFlag.Get(argc, argv);
|
|
||||||
EXPECT_TRUE(Flag.isSome());
|
|
||||||
EXPECT_TRUE(*Flag);
|
|
||||||
|
|
||||||
const char* const expArgv[] = {kFirefox, nullptr};
|
|
||||||
EXPECT_TRUE(CheckArgv(argv, expArgv));
|
|
||||||
}
|
|
||||||
{
|
|
||||||
char* argv[] = {kFirefox, nullptr};
|
|
||||||
int argc = ArrayLength(argv);
|
|
||||||
EXPECT_EQ(argc, 2);
|
|
||||||
|
|
||||||
Maybe<bool> Flag = kFlag.Get(argc, argv);
|
|
||||||
EXPECT_TRUE(Flag.isNothing());
|
|
||||||
|
|
||||||
const char* const expArgv[] = {kFirefox, nullptr};
|
|
||||||
EXPECT_TRUE(CheckArgv(argv, expArgv));
|
|
||||||
}
|
|
||||||
{
|
|
||||||
std::vector<std::string> extraArgs;
|
|
||||||
EXPECT_EQ(extraArgs.size(), 0U);
|
|
||||||
kFlag.Put(true, extraArgs);
|
|
||||||
EXPECT_EQ(extraArgs.size(), 1U);
|
|
||||||
EXPECT_EQ(extraArgs[0], "-Flag");
|
|
||||||
}
|
|
||||||
{
|
|
||||||
std::vector<std::string> extraArgs;
|
|
||||||
EXPECT_EQ(extraArgs.size(), 0U);
|
|
||||||
kFlag.Put(false, extraArgs);
|
|
||||||
EXPECT_EQ(extraArgs.size(), 0U);
|
|
||||||
}
|
|
||||||
{ EXPECT_EQ(kFlag.Name(), "-Flag"); }
|
|
||||||
}
|
|
||||||
|
|
@ -8,7 +8,6 @@ Library("xretest")
|
||||||
|
|
||||||
UNIFIED_SOURCES = [
|
UNIFIED_SOURCES = [
|
||||||
"TestCompatVersionCompare.cpp",
|
"TestCompatVersionCompare.cpp",
|
||||||
"TestGeckoArgs.cpp",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче