Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
9200818a
Commit
9200818a
authored
Jun 30, 2021
by
Ming Rui Zhang
Browse files
Options
Downloads
Patches
Plain Diff
script: use consistent name for mute jami dring option
Change-Id: I7e3db31838884bc585d981ced91b4294cd5a8c14
parent
32a8978f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
make-client.py
+3
-3
3 additions, 3 deletions
make-client.py
tests/qml/main.cpp
+2
-2
2 additions, 2 deletions
tests/qml/main.cpp
tests/unittests/main_unittest.cpp
+2
-2
2 additions, 2 deletions
tests/unittests/main_unittest.cpp
with
7 additions
and
7 deletions
make-client.py
+
3
−
3
View file @
9200818a
...
@@ -303,8 +303,8 @@ def run_tests(mute_jamid, output_to_files):
...
@@ -303,8 +303,8 @@ def run_tests(mute_jamid, output_to_files):
test_exe_command_list
=
[
qml_test_exe
,
unit_test_exe
]
test_exe_command_list
=
[
qml_test_exe
,
unit_test_exe
]
if
mute_jamid
:
if
mute_jamid
:
test_exe_command_list
[
0
]
+=
'
-mutejami
'
test_exe_command_list
[
0
]
+=
'
-mutejami
d
'
test_exe_command_list
[
1
]
+=
'
-mutejami
'
test_exe_command_list
[
1
]
+=
'
-mutejami
d
'
if
output_to_files
:
if
output_to_files
:
test_exe_command_list
[
0
]
+=
'
-o
'
+
this_dir
+
'
\\
x64
\\
test
\\
qml_tests.txt
'
test_exe_command_list
[
0
]
+=
'
-o
'
+
this_dir
+
'
\\
x64
\\
test
\\
qml_tests.txt
'
test_exe_command_list
[
1
]
+=
'
>
'
+
this_dir
+
'
\\
x64
\\
test
\\
unittests.txt
'
test_exe_command_list
[
1
]
+=
'
>
'
+
this_dir
+
'
\\
x64
\\
test
\\
unittests.txt
'
...
@@ -359,7 +359,7 @@ def parse_args():
...
@@ -359,7 +359,7 @@ def parse_args():
run_test
=
subparser
.
add_parser
(
'
runtests
'
)
run_test
=
subparser
.
add_parser
(
'
runtests
'
)
run_test
.
add_argument
(
run_test
.
add_argument
(
'
-md
'
,
'
--mutejami
'
,
action
=
'
store_true
'
,
default
=
False
,
'
-md
'
,
'
--mutejami
d
'
,
action
=
'
store_true
'
,
default
=
False
,
help
=
'
Avoid jamid logs
'
)
help
=
'
Avoid jamid logs
'
)
run_test
.
add_argument
(
run_test
.
add_argument
(
'
-o
'
,
'
--outputtofiles
'
,
action
=
'
store_true
'
,
default
=
False
,
'
-o
'
,
'
--outputtofiles
'
,
action
=
'
store_true
'
,
default
=
False
,
...
...
...
...
This diff is collapsed.
Click to expand it.
tests/qml/main.cpp
+
2
−
2
View file @
9200818a
...
@@ -182,10 +182,10 @@ main(int argc, char** argv)
...
@@ -182,10 +182,10 @@ main(int argc, char** argv)
{
{
bool
muteDring
{
false
};
bool
muteDring
{
false
};
// Remove "-mutejami" from argv, as quick_test_main_with_setup() will
// Remove "-mutejami
d
" from argv, as quick_test_main_with_setup() will
// fail if given an invalid command-line argument.
// fail if given an invalid command-line argument.
auto
end
=
std
::
remove_if
(
argv
+
1
,
argv
+
argc
,
[](
char
*
argv
)
{
auto
end
=
std
::
remove_if
(
argv
+
1
,
argv
+
argc
,
[](
char
*
argv
)
{
return
(
strcmp
(
argv
,
"-mutejami"
)
==
0
);
return
(
strcmp
(
argv
,
"-mutejami
d
"
)
==
0
);
});
});
if
(
end
!=
argv
+
argc
)
{
if
(
end
!=
argv
+
argc
)
{
...
...
...
...
This diff is collapsed.
Click to expand it.
tests/unittests/main_unittest.cpp
+
2
−
2
View file @
9200818a
...
@@ -27,10 +27,10 @@ TestEnvironment globalEnv;
...
@@ -27,10 +27,10 @@ TestEnvironment globalEnv;
int
int
main
(
int
argc
,
char
*
argv
[])
main
(
int
argc
,
char
*
argv
[])
{
{
// Remove "-mutejami" from argv, as quick_test_main_with_setup() will
// Remove "-mutejami
d
" from argv, as quick_test_main_with_setup() will
// fail if given an invalid command-line argument.
// fail if given an invalid command-line argument.
auto
end
=
std
::
remove_if
(
argv
+
1
,
argv
+
argc
,
[](
char
*
argv
)
{
auto
end
=
std
::
remove_if
(
argv
+
1
,
argv
+
argc
,
[](
char
*
argv
)
{
return
(
strcmp
(
argv
,
"-mutejami"
)
==
0
);
return
(
strcmp
(
argv
,
"-mutejami
d
"
)
==
0
);
});
});
if
(
end
!=
argv
+
argc
)
{
if
(
end
!=
argv
+
argc
)
{
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment