[Audit-test-developer] [PATCH 13/20] remove mainly unused AUDITPATH env variable

[Jiri J. <jja...@re...>]

Signed-off-by: Jiri Jaburek <jja...@re...>
---
 audit-test/README.netfilter                   |  4 ----
 audit-test/netfilebt/run.conf                 |  2 +-
 audit-test/utils/netfilter/config-server.bash | 10 ----------
 audit-test/utils/netfilter/profile.sample     |  1 -
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/audit-test/README.netfilter b/audit-test/README.netfilter
index 9308568..97daeb6 100644
--- a/audit-test/README.netfilter
+++ b/audit-test/README.netfilter
@@ -141,9 +141,6 @@ PASSWD         		The root/eal password for the TOE
 
 PATH			"$PATH:." The PATH should include the local directory
 
-AUDITPATH      		Usually "/usr/local/eal4_testing/audit-test", the
-			recommended location for installing the test suite
-
 LOCAL_DEV      		Device for the TOE primary network, such as "eth3"
 
 LOCAL_SEC_DEV  		Device for the TOE secondary network, such as "eth4"
@@ -206,7 +203,6 @@ export MODE=64
 export PPROFILE=lspp
 export PATH="$PATH:."
 export PASSWD="redhat"
-export AUDITPATH=/usr/local/eal4_testing/audit-test
 export LOCAL_DEV="eth3"
 export LOCAL_SEC_DEV="eth4"
 export LOCAL_SEC_MAC="78:2B:CB:4B:EB:BC"
diff --git a/audit-test/netfilebt/run.conf b/audit-test/netfilebt/run.conf
index 85a1958..5b0cf58 100644
--- a/audit-test/netfilebt/run.conf
+++ b/audit-test/netfilebt/run.conf
@@ -569,7 +569,7 @@ function run_test {
     shift
     eval "$(parse_named "$@")" || exit_error
 
-    source $AUDITPATH/netfilebt/netfilebt_functions.bash || exit_error
+    source netfilebt_functions.bash || exit_error
 
     if [[ tnum -eq 41 ]]; then
        ./testperm.bash
diff --git a/audit-test/utils/netfilter/config-server.bash b/audit-test/utils/netfilter/config-server.bash
index 7f40a6b..e28bab9 100755
--- a/audit-test/utils/netfilter/config-server.bash
+++ b/audit-test/utils/netfilter/config-server.bash
@@ -91,15 +91,6 @@ PASSWD="$(ask "Superuser passwword")"
 echo "export PASSWD=$PASSWD" >> ./profile.$hostext
 echo ""
 
-echo "The directory path to audit-test requested below is for the toe"
-echo "the directory path to audit-test on the netserver should be the same"
-echo "If the path on the netserver is different you will need to manually"
-echo "edit the AUDITPATH environmental variable in the /tmp/profile file"
-echo "on the netserver after the profile is copied to the netserver's /tmp"
-echo "directory to reflect the correct path to the audit-tests directory"
-echo ""
-
-AUDITPATH="$(ask "Directory path of audit-test (include audit-test)" "$AUDITPATH")"
 LOCAL_DEV="$(ask "Primary network device name of TOE" "$LOCAL_DEV")"
 LOCAL_SEC_DEV="$(ask "Secondary network device name of TOE" "$LOCAL_SEC_DEV")"
 LOCAL_SEC_MAC="$(ask "Secondary device mac address of TOE (mac/mask)" "$LOCAL_SEC_MAC")"
@@ -108,7 +99,6 @@ LOCAL_IPV6="$(ask "IPV6 address of TOE primary device" "$LOCAL_IPV6")"
 LOCAL_SEC_IPV4="$(ask "IPV4 address of TOE secondary device" "$LOCAL_SEC_IPV4")"
 LOCAL_SEC_IPV6="$(ask "IPV6 address of TOE secondary device" "$LOCAL_SEC_IPV6")"
 
-echo "export AUDITPATH=\"$AUDITPATH\"" >> ./profile.$hostext
 echo "export LOCAL_DEV=\"$LOCAL_DEV\"" >> ./profile.$hostext
 echo "export LOCAL_SEC_DEV=\"$LOCAL_SEC_DEV\"" >> ./profile.$hostext
 echo "export LOCAL_SEC_MAC=\"$LOCAL_SEC_MAC\"" >> ./profile.$hostext
diff --git a/audit-test/utils/netfilter/profile.sample b/audit-test/utils/netfilter/profile.sample
index ba749b1..5c86843 100644
--- a/audit-test/utils/netfilter/profile.sample
+++ b/audit-test/utils/netfilter/profile.sample
@@ -6,7 +6,6 @@ export MODE=64
 export PPROFILE=lspp
 export PATH="$PATH:."
 export PASSWD="redhat"
-export AUDITPATH="/usr/local/eal4_testing/audit-test"
 export LOCAL_DEV="eth3"
 export LOCAL_SEC_DEV="eth4"
 export LOCAL_SEC_MAC="78:2B:CB:4B:EB:BC"
-- 
1.7.11.7