mirror of
https://git.sr.ht/~cismonx/bookmarkfs
synced 2025-07-23 01:28:55 +00:00
Compare commits
No commits in common. "c1cf9db2a1f90cff677bae5598472141d9ace885" and "ab88e0e839f88a2073938732eb1ff6ff0f470e79" have entirely different histories.
c1cf9db2a1
...
ab88e0e839
5 changed files with 38 additions and 111 deletions
|
|
@ -1352,14 +1352,12 @@ intfs_delete (
|
|||
) {
|
||||
int status = -EPERM;
|
||||
|
||||
int64_t bm_parent_id = BOOKMARKS_ROOT_ID;
|
||||
switch (parent_id) {
|
||||
case INTFS_ID_TAGS:
|
||||
flags |= BOOKMARKFS_BOOKMARK_TYPE(TAG);
|
||||
bm_parent_id = TAGS_ROOT_ID;
|
||||
// fallthrough
|
||||
case INTFS_ID_BOOKMARKS:
|
||||
status = bm_delete(bm_parent_id, name, flags);
|
||||
status = bm_delete(BOOKMARKS_ROOT_ID, name, flags);
|
||||
break;
|
||||
|
||||
case INTFS_ID_KEYWORDS:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
EXTRA_DIST = package.m4 testsuite.at $(TESTSUITE) $(TESTS_)
|
||||
|
||||
TESTS_ = lib_hash.at lib_prng.at lib_watcher.at lib_sandbox.at \
|
||||
lib_hashmap.at fs_basic.at fs_regrw.at fs_dents.at fs_assoc.at
|
||||
lib_hashmap.at fs_basic.at fs_regrw.at fs_dents.at
|
||||
|
||||
# Helper programs for testing
|
||||
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
dnl
|
||||
dnl Copyright (C) 2025 CismonX <admin@cismon.net>
|
||||
dnl
|
||||
dnl Copying and distribution of this file, with or without modification,
|
||||
dnl are permitted in any medium without royalty,
|
||||
dnl provided the copyright notice and this notice are preserved.
|
||||
dnl This file is offered as-is, without any warranty.
|
||||
dnl
|
||||
|
||||
AT_SETUP([fs: tags and keywords])
|
||||
AT_KEYWORDS([fs assoc tag keyword])
|
||||
|
||||
ATX_CHECK_FS_NEW_ASSOC([eol], , [
|
||||
ATX_RUN_REPEAT([8], [
|
||||
name=$(ath_fn_rand_u64_hex)
|
||||
tag=$(ath_fn_rand_u64_hex)
|
||||
keyword=$(ath_fn_rand_u64_hex)
|
||||
content=foo:$(ath_fn_rand_u64_hex)
|
||||
|
||||
ATX_RUN([
|
||||
echo "$content/1" > $name-1
|
||||
echo "$content/2" > $name-2
|
||||
echo "$content/3" > $name-3
|
||||
mkdir "$atx_tags/$tag-1" "$atx_tags/$tag-2" "$atx_tags/$tag-3"
|
||||
|
||||
ln $name-1 $name-2 "$atx_tags/$tag-1"
|
||||
ln $name-2 $name-3 "$atx_tags/$tag-2"
|
||||
ln $name-3 $name-1 "$atx_tags/$tag-3"
|
||||
test $name-1 -ef "$atx_tags/$tag-1/$name-1"
|
||||
test $name-1 -ef "$atx_tags/$tag-3/$name-1"
|
||||
test $name-2 -ef "$atx_tags/$tag-1/$name-2"
|
||||
test $name-2 -ef "$atx_tags/$tag-2/$name-2"
|
||||
test $name-3 -ef "$atx_tags/$tag-3/$name-3"
|
||||
test $name-3 -ef "$atx_tags/$tag-2/$name-3"
|
||||
|
||||
ln $name-1 "$atx_keywords/$keyword-2"
|
||||
ln $name-2 "$atx_keywords/$keyword-3"
|
||||
ln $name-3 "$atx_keywords/$keyword-1"
|
||||
test $name-1 -ef "$atx_keywords/$keyword-2"
|
||||
test $name-2 -ef "$atx_keywords/$keyword-3"
|
||||
test $name-3 -ef "$atx_keywords/$keyword-1"
|
||||
|
||||
rm "$atx_tags/$tag-1/$name-1"
|
||||
rm "$atx_tags/$tag-2/$name-2"
|
||||
rm "$atx_tags/$tag-3/$name-3"
|
||||
test ! -e "$atx_tags/$tag-1/$name-1"
|
||||
test ! -e "$atx_tags/$tag-2/$name-2"
|
||||
test ! -e "$atx_tags/$tag-3/$name-3"
|
||||
|
||||
rm "$atx_keywords/$keyword-1"
|
||||
rm "$atx_keywords/$keyword-2"
|
||||
test ! -e "$atx_keywords/$keyword-1"
|
||||
test ! -e "$atx_keywords/$keyword-2"
|
||||
|
||||
rm $name-1 $name-2 $name-3
|
||||
test ! -e "$atx_tags/$tag-1/$name-2"
|
||||
test ! -e "$atx_tags/$tag-2/$name-3"
|
||||
test ! -e "$atx_tags/$tag-3/$name-1"
|
||||
test ! -e "$atx_keywords/$keyword-3"
|
||||
])
|
||||
])
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
|
@ -15,48 +15,53 @@ AT_KEYWORDS([fs basic])
|
|||
ATX_CHECK_FS_NEW_ANY([eol], , [
|
||||
ATX_RUN_REPEAT([8], [
|
||||
name=$(ath_fn_rand_u64_hex)
|
||||
name_1=${name}_1
|
||||
name_2=${name}_2
|
||||
|
||||
content=foo:$(ath_fn_rand_u64_hex)
|
||||
content_1=${content}/1
|
||||
content_2=${content}/2
|
||||
|
||||
ATX_RUN([
|
||||
echo "$content/1" > $name-1
|
||||
test "$(cat $name-1)" = "$content/1"
|
||||
echo "$content/2" > $name-2
|
||||
test "$(cat $name-2)" = "$content/2"
|
||||
echo "$content_1" > $name_1
|
||||
test "$(cat $name_1)" = "$content_1"
|
||||
echo "$content_2" > $name_2
|
||||
test "$(cat $name_2)" = "$content_2"
|
||||
|
||||
mv $name-1 $name-2
|
||||
test ! -e $name-1
|
||||
test "$(cat $name-2)" = "$content/1"
|
||||
mv $name_1 $name_2
|
||||
test ! -e $name_1
|
||||
test "$(cat $name_2)" = "$content_1"
|
||||
|
||||
mv $name-2 $name-1
|
||||
test ! -e $name-2
|
||||
test "$(cat $name-1)" = "$content/1"
|
||||
mv $name_2 $name_1
|
||||
test ! -e $name_2
|
||||
test "$(cat $name_1)" = "$content_1"
|
||||
|
||||
mkdir $name-2
|
||||
mv $name-1 $name-2/$name-2
|
||||
test ! -e $name-1
|
||||
test "$(cat $name-2/$name-2)" = "$content/1"
|
||||
mkdir $name_2
|
||||
mv $name_1 $name_2/$name_2
|
||||
test ! -e $name_1
|
||||
test "$(cat $name_2/$name_2)" = "$content_1"
|
||||
|
||||
! mkdir $name-2/$name-2
|
||||
mkdir $name-2/$name-1
|
||||
mv $name-2/$name-2 $name-2/$name-1/$name-1
|
||||
test "$(cat $name-2/$name-1/$name-1)" = "$content/1"
|
||||
! mkdir $name_2/$name_2
|
||||
mkdir $name_2/$name_1
|
||||
mv $name_2/$name_2 $name_2/$name_1/$name_1
|
||||
test "$(cat $name_2/$name_1/$name_1)" = "$content_1"
|
||||
|
||||
mkdir $name-1
|
||||
! mv $name-1 $name-2/$name-1/$name-1
|
||||
! mv $name-1 $name-2
|
||||
mkdir $name_1
|
||||
! mv $name_1 $name_2/$name_1/$name_1
|
||||
! mv $name_1 $name_2
|
||||
|
||||
! mv $name-2/$name-1/$name-1 $name-2
|
||||
rm $name-2/$name-1/$name-1
|
||||
test ! -e $name-2/$name-1/$name-1
|
||||
! mv $name_2/$name_1/$name_1 $name_2
|
||||
rm $name_2/$name_1/$name_1
|
||||
test ! -e $name_2/$name_1/$name_1
|
||||
|
||||
mv $name-1 $name-2
|
||||
test ! -e $name-1
|
||||
test -d $name-2/$name-1
|
||||
mv $name_1 $name_2
|
||||
test ! -e $name_1
|
||||
test -d $name_2/$name_1
|
||||
|
||||
! rmdir $name-2
|
||||
rmdir $name-2/$name-1
|
||||
rmdir $name-2
|
||||
test ! -e $name-2
|
||||
! rmdir $name_2
|
||||
rmdir $name_2/$name_1
|
||||
rmdir $name_2
|
||||
test ! -e $name_2
|
||||
])
|
||||
])
|
||||
])
|
||||
|
|
|
|||
|
|
@ -174,17 +174,6 @@ m4_define([ATX_CHECK_FS_NEW_ANY], [
|
|||
])
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl ATX_CHECK_FS_NEW_ASSOC([options], [prepare], [check])
|
||||
dnl
|
||||
m4_define([ATX_CHECK_FS_NEW_ASSOC], [
|
||||
ATX_CHECK_FS_NEW([firefox], [$1], [mnt.tmp], [$2], [
|
||||
atx_tags=../../tags
|
||||
atx_keywords=../../keywords
|
||||
ATX_RUN_IN_DIR([mnt.tmp/bookmarks/unfiled], [$3])
|
||||
])
|
||||
])
|
||||
|
||||
dnl -- Helper functions --
|
||||
|
||||
AT_TEST_HELPER_FN([rand_u64_hex], , , [
|
||||
|
|
@ -219,4 +208,3 @@ AT_BANNER([The Filesystem])
|
|||
m4_include([fs_basic.at])
|
||||
m4_include([fs_regrw.at])
|
||||
m4_include([fs_dents.at])
|
||||
m4_include([fs_assoc.at])
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue