Просмотр исходного кода

test: Use a file to determine TEST_DEFAULT_GROUP

This is more safe against sticky bits. For example, in FreeBSD
all files created in /tmp have the group set to wheel.

Gbp-Dch: ignore
Julian Andres Klode лет назад: 10
Родитель
Сommit
71e22da91f
1 измененных файлов с 2 добавлено и 5 удалено
  1. 2 5
      test/integration/framework

+ 2 - 5
test/integration/framework

@@ -451,11 +451,8 @@ EOF
 
 
 	# create some files in /tmp and look at user/group to get what this means
 	# create some files in /tmp and look at user/group to get what this means
 	TEST_DEFAULT_USER="$(id -un)"
 	TEST_DEFAULT_USER="$(id -un)"
-	if [ "$(uname)" = 'GNU/kFreeBSD' ]; then
-		TEST_DEFAULT_GROUP='root'
-	else
-		TEST_DEFAULT_GROUP="$(id -gn)"
-	fi
+	touch "${TMPWORKINGDIRECTORY}/test-file"
+	TEST_DEFAULT_GROUP=$(stat --format '%G'  "${TMPWORKINGDIRECTORY}/test-file")
 
 
 	# cleanup the environment a bit
 	# cleanup the environment a bit
 	# prefer our apt binaries over the system apt binaries
 	# prefer our apt binaries over the system apt binaries