Improved assignment behaior. Closed #2

parent 4554f0cb
......@@ -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)
......
......@@ -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);
......
......@@ -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() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment