Navigation

← Previous Changeset
Next Changeset →

Changeset 2439

Timestamp:

10/04/07 10:23:25 (1 year ago)

Author:

pebenito

Message:

tools: update for merged strict-targeted policy

Files:

tools/buildtest.sh (modified) (2 diffs)
tools/quicktest.sh (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

tools/buildtest.sh

r2117	r2439
2	2
3	3	DISTROS="rhel4 gentoo debian"
4		TYPES="strict targeted strict-mcs targeted-mcs strict-mls targeted-mls"
	4	TYPES="standard mcs mls"
	5	ILKS="strict targeted"
5	6	POLVER="`checkpolicy -V \|cut -f 1 -d ' '`"
6	7	SETFILES="/usr/sbin/setfiles"
…	…
23	24	}
24	25
	26	set_ilk() {
	27	if [[ $1 != "targeted" ]]; then
	28	sed -i -e '/^anaconda/s/module$/off/' policy/modules.conf
	29	sed -i -e '/^firstboot/s/module$/off/' policy/modules.conf
	30	sed -i -e '/^unconfined/s/module$/off/' policy/modules.conf
	31	fi
	32	egrep "^(unconfined\|firstboot\|anaconda)" policy/modules.conf
	33	}
	34
25	35	do_test() {
26	36	local OPTS=""
27	37
28	38	for i in $TYPES; do
29		# Monolithic tests
30		trap cleanup_mon SIGINT SIGQUIT
31		OPTS="TYPE=$i MONOLITHIC=y QUIET=y DIRECT_INITRC=y"
32		[ ! -z "$1" ] && OPTS="$OPTS DISTRO=$1"
33		echo "** Options: $OPTS **"
34		echo -ne "\033]0;mon $i $1\007"
35		make $OPTS conf \|\| die "$?" "$OPTS"
36		make $OPTS \|\| die "$?" "$OPTS"
37		make $OPTS file_contexts \|\| die "$?" "$OPTS"
38		$SETFILES -q -c policy.$POLVER file_contexts \|\| die "$?" "$OPTS"
39		cleanup_mon
	39	for j in $ILKS; do
	40	# Monolithic tests
	41	trap cleanup_mon SIGINT SIGQUIT
	42	OPTS="TYPE=$i MONOLITHIC=y QUIET=y DIRECT_INITRC=y"
	43	[ ! -z "$1" ] && OPTS="$OPTS DISTRO=$1"
	44	echo "** Options: $OPTS **"
	45	echo -ne "\033]0;mon $i $j $1\007"
	46	make $OPTS conf \|\| die "$?" "$OPTS"
	47	set_ilk $j
	48	make $OPTS \|\| die "$?" "$OPTS"
	49	make $OPTS file_contexts \|\| die "$?" "$OPTS"
	50	$SETFILES -q -c policy.$POLVER file_contexts \|\| die "$?" "$OPTS"
	51	cleanup_mon
40	52
41		# Loadable module tests
42		trap cleanup_mod SIGINT SIGQUIT
43		OPTS="TYPE=$i MONOLITHIC=n QUIET=y DIRECT_INITRC=y"
44		[ ! -z "$1" ] && OPTS="$OPTS DISTRO=$1"
45		echo "** Options: $OPTS **"
46		echo -ne "\033]0;mod $i $1\007"
47		make $OPTS conf \|\| die "$?" "$OPTS"
48		make $OPTS base \|\| die "$?" "$OPTS"
49		make $OPTS -j2 modules \|\| die "$?" "$OPTS"
50		make $OPTS validate \|\| die "$?" "$OPTS"
51		cleanup_mod
	53	# Loadable module tests
	54	trap cleanup_mod SIGINT SIGQUIT
	55	OPTS="TYPE=$i MONOLITHIC=n QUIET=y DIRECT_INITRC=y"
	56	[ ! -z "$1" ] && OPTS="$OPTS DISTRO=$1"
	57	echo "** Options: $OPTS **"
	58	echo -ne "\033]0;mod $i $j $1\007"
	59	make $OPTS conf \|\| die "$?" "$OPTS"
	60	set_ilk $j
	61	make $OPTS base \|\| die "$?" "$OPTS"
	62	make $OPTS -j3 modules \|\| die "$?" "$OPTS"
	63	make $OPTS validate \|\| die "$?" "$OPTS"
	64	cleanup_mod
	65	done
52	66	done
53	67	}

tools/quicktest.sh

r2414	r2439
1	1	#!/bin/bash
2	2
3		TYPES="strict targeted-mcs strict-mls"
	3	TYPES="standard mcs mls"
	4	ILKS="strict targeted"
4	5	POLVER="`checkpolicy -V \|cut -f 1 -d ' '`"
5	6	SETFILES="/usr/sbin/setfiles"
…	…
22	23	}
23	24
	25	set_ilk() {
	26	if [[ $1 != "targeted" ]]; then
	27	sed -i -e '/^anaconda/s/module$/off/' policy/modules.conf
	28	sed -i -e '/^firstboot/s/module$/off/' policy/modules.conf
	29	sed -i -e '/^unconfined/s/module$/off/' policy/modules.conf
	30	fi
	31	egrep "^(unconfined\|firstboot\|anaconda)" policy/modules.conf
	32	}
	33
24	34	do_test() {
25	35	local OPTS=""
26	36
27	37	for i in $TYPES; do
28		# Monolithic tests
29		trap cleanup_mon SIGINT SIGQUIT
30		OPTS="TYPE=$i MONOLITHIC=y QUIET=y DIRECT_INITRC=y"
31		[ ! -z "$1" ] && OPTS="$OPTS DISTRO=$1"
32		echo "** Options: $OPTS **"
33		echo -ne "\033]0;mon $i $1\007"
34		make $OPTS conf \|\| die "$?" "$OPTS"
35		make $OPTS \|\| die "$?" "$OPTS"
36		make $OPTS file_contexts \|\| die "$?" "$OPTS"
37		$SETFILES -q -c policy.$POLVER file_contexts \|\| die "$?" "$OPTS"
38		cleanup_mon
	38	for j in $ILKS; do
	39	# Monolithic tests
	40	trap cleanup_mon SIGINT SIGQUIT
	41	OPTS="TYPE=$i MONOLITHIC=y QUIET=y DIRECT_INITRC=y"
	42	[ ! -z "$1" ] && OPTS="$OPTS DISTRO=$1"
	43	echo "** Options: $OPTS **"
	44	echo -ne "\033]0;mon $i $j $1\007"
	45	make $OPTS conf \|\| die "$?" "$OPTS"
	46	set_ilk $j
	47	make $OPTS \|\| die "$?" "$OPTS"
	48	make $OPTS file_contexts \|\| die "$?" "$OPTS"
	49	$SETFILES -q -c policy.$POLVER file_contexts \|\| die "$?" "$OPTS"
	50	cleanup_mon
39	51
40		# Loadable module tests
41		trap cleanup_mod SIGINT SIGQUIT
42		OPTS="TYPE=$i MONOLITHIC=n QUIET=y DIRECT_INITRC=y"
43		[ ! -z "$1" ] && OPTS="$OPTS DISTRO=$1"
44		echo "** Options: $OPTS **"
45		echo -ne "\033]0;mod $i $1\007"
46		make $OPTS conf \|\| die "$?" "$OPTS"
47		make $OPTS base \|\| die "$?" "$OPTS"
48		make $OPTS -j3 modules \|\| die "$?" "$OPTS"
49		make $OPTS validate \|\| die "$?" "$OPTS"
50		cleanup_mod
	52	# Loadable module tests
	53	trap cleanup_mod SIGINT SIGQUIT
	54	OPTS="TYPE=$i MONOLITHIC=n QUIET=y DIRECT_INITRC=y"
	55	[ ! -z "$1" ] && OPTS="$OPTS DISTRO=$1"
	56	echo "** Options: $OPTS **"
	57	echo -ne "\033]0;mod $i $j $1\007"
	58	make $OPTS conf \|\| die "$?" "$OPTS"
	59	set_ilk $j
	60	make $OPTS base \|\| die "$?" "$OPTS"
	61	make $OPTS -j3 modules \|\| die "$?" "$OPTS"
	62	make $OPTS validate \|\| die "$?" "$OPTS"
	63	cleanup_mod
	64	done
51	65	done
52	66	}

Download in other formats:

Unified Diff
Zip Disabled

* Generating other formats may take time.