Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
See what's new at GitLab
4
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
V
vitis
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eugene 'Vindex' Stulin
vitis
Commits
ae135550
Commit
ae135550
authored
Oct 02, 2019
by
Eugene 'Vindex' Stulin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved assignment behaior. Closed
#2
parent
4554f0cb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
27 deletions
+35
-27
Makefile
Makefile
+1
-1
source/module_assign.d
source/module_assign.d
+3
-0
testing/testing.sh
testing/testing.sh
+31
-26
No files found.
Makefile
View file @
ae135550
...
...
@@ -15,7 +15,7 @@ else
endif
ifeq
($(PLANG),D)
DC
=
ldc2
#dmd, gdc or ldc2
DC
=
gdc
#dmd, gdc or ldc2
PHOBOS_LINKING
=
static
#static or dynamic
RELEASE_ARGS
=
release
$(DC)
$(PHOBOS_LINKING)
DEBUG_ARGS
=
debug
$(DC)
$(PHOBOS_LINKING)
...
...
source/module_assign.d
View file @
ae135550
...
...
@@ -260,6 +260,9 @@ void assignCategoriesToFiles(string[] categories,
"error"
.
tprintln
(
f
,
": file or directory not found."
.
_s
,
" "
,
"The request is skipped."
.
_s
);
}
if
(
filesFromFS
.
empty
)
{
return
;
}
if
(
flagSave
)
foreach
(
ref
f
;
filesFromFS
)
{
f
=
addFileInFileSpace
(
f
,
destFileSpace
,
userConfirmation
,
userDenial
);
...
...
testing/testing.sh
View file @
ae135550
...
...
@@ -149,6 +149,11 @@ Path: /tmp/Files/yeats.txt
Start: 9,1
Finish: "
# experimantal link to ISO for saving
ISO
=
debian-hurd-2019-i386-DVD-1.iso
DEBIANCD
=
https://cdimage.debian.org/cdimage/
DEBIANHURD
=
"
${
DEBIANCD
}
/ports/current-hurd-i386/iso-dvd/
${
ISO
}
"
FP_NAME
=
"But_I_being_poor.fragpointer"
FP_BASEDIR
=
"
${
VTS
}
/__vitis/fragpointers"
FP_PATH
=
"
${
FP_BASEDIR
}
/
${
FP_NAME
}
"
...
...
@@ -877,7 +882,7 @@ case_2_2_9() {
output
=
$(
$CMD
$OPTCONF_NOAUTO
2>&1
)
msg
=
": file or directory not found. The request is skipped."
expected
=
"nonexistent_file
${
msg
}
"
if
[[
!
-
L
"
${
VTS
}
/Category"
&&
"
${
output
}
"
==
"
${
expected
}
"
]]
;
then
if
[[
!
-
e
"
${
VTS
}
/Category"
&&
"
${
output
}
"
==
"
${
expected
}
"
]]
;
then
pass
"
${
CMD
}
"
else
fail
"
${
CMD
}
"
...
...
@@ -1885,9 +1890,6 @@ Icon=text-html"
case_2_8_2
()
{
subtitle
"Case 2: two network bookmarks"
DLANG
=
"https://dlang.org"
ISO
=
debian-hurd-2019-i386-DVD-1.iso
DEBIANHURD
=
"https://cdimage.debian.org/cdimage/ports/current-hurd-i386/
\
iso-dvd/
$ISO
"
CMD
=
"
$vitis
assign -i
$DLANG
$DEBIANHURD
"
$CMD
$OPTCONF
link_entries_html
=
${
VTS
}
/__vitis/link_entries/html
...
...
@@ -1955,9 +1957,6 @@ case_2_8_4() {
subtitle
"Case 4: two network bookmarks and -c"
DLANG
=
"https://dlang.org"
DTITLE
=
"Home - D Programming Language"
ISO
=
debian-hurd-2017-i386-DVD-1.iso
DEBIANHURD
=
"https://cdimage.debian.org/cdimage/ports/current-hurd-i386/
\
iso-dvd/
$ISO
"
CMD
=
"
$vitis
assign -i
$DLANG
$DEBIANHURD
-c Favorites --yes"
$CMD
$OPTCONF
link_entries_html
=
${
VTS
}
/__vitis/link_entries/html
...
...
@@ -1995,6 +1994,12 @@ Icon=text-html"
pass
"
${
CMD
}
"
else
fail
"
${
CMD
}
"
echo
"1"
ls
/tmp/Vitis/__vitis/link_entries/
echo
"2"
ls
/tmp/Vitis/__vitis/link_entries/non-html
echo
"3"
ls
/tmp/Vitis/__vitis/link_entries/html
fi
rm
-rf
"
${
VTS
}
"
}
...
...
@@ -2029,11 +2034,11 @@ Icon=text-html"
procedure_2_8
()
{
procedure_title
"PROCEDURE 2.8 'Network Bookmarks'"
case_2_8_1
case_2_8_2
case_2_8_3
#
case_2_8_1
#
case_2_8_2
#
case_2_8_3
case_2_8_4
case_2_8_5
#
case_2_8_5
}
case_2_9_1
()
{
...
...
@@ -2460,18 +2465,18 @@ procedure_2_12() {
}
tests_assign
()
{
#
procedure_2_1
#
procedure_2_2
#
procedure_2_3
#
procedure_2_4
#
procedure_2_5
#
procedure_2_6
#
procedure_2_7
#
procedure_2_8
procedure_2_1
procedure_2_2
procedure_2_3
procedure_2_4
procedure_2_5
procedure_2_6
procedure_2_7
procedure_2_8
procedure_2_9
#
procedure_2_10
#
procedure_2_11
#
procedure_2_12
procedure_2_10
procedure_2_11
procedure_2_12
}
...
...
@@ -3295,11 +3300,11 @@ tests_show() {
################################################################################
automatic_tests
()
{
#
procedure_base_tests
#
tests_create
procedure_base_tests
tests_create
tests_assign
#
tests_delete
#
tests_show
tests_delete
tests_show
}
manual_tests
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment