[Fai-commit] r6263 - trunk

[Michael Prokop]

Author: mika
Date: 2010-12-27 21:58:46 +0000 (Mon, 27 Dec 2010)
New Revision: 6263

Modified:
   trunk/Makefile
Log:
Makefile: re-add removed SHELL_SCRIPTS - instead ignore missing files when running syntax check; disable examples/more-tests/tests/* and examples/simple/tests/FAIBASE_TEST

Instead of removing the files from SHELL_SCRIPTS that are
available in 3.4-releases but not in trunk versions anymore let's
just check for the existence of the files and if they can't be read
let's skip them. This allows us to check all existing files
independent of the FAI version. This reverts change of svn r6262.

Also drop tests for examples/more-tests/tests/* and
examples/simple/tests/FAIBASE_TEST as they are failing due to:

  Can't locate Faitest.pm in @INC

for now.

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-12-26 23:39:52 UTC (rev 6262)
+++ trunk/Makefile	2010-12-27 21:58:46 UTC (rev 6263)
@@ -11,8 +11,8 @@
 
 # for syntax checks
 BASH_SCRIPTS = lib/fai-divert lib/fai-mount-disk lib/fai-savelog lib/fai-vol_id lib/get-boot-info lib/get-config-dir lib/get-config-dir-cvs lib/get-config-dir-file lib/get-config-dir-git lib/get-config-dir-hg lib/get-config-dir-nfs lib/get-config-dir-svn lib/mkramdisk lib/mount2dir lib/prcopyleft lib/subroutines lib/task_sysinfo lib/updatebase
-SHELL_SCRIPTS = lib/check_status lib/create_resolv_conf lib/updatebase lib/fai-abort lib/fai-divert lib/load_keymap_consolechars lib/disk-info utils/mkdebmirror utils/create-nfsroot-tar utils/all_hosts utils/rshall bin/policy-rc.d.fai bin/dhclient-fai-script
-PERL_SCRIPTS = lib/setup-storage/*.pm bin/ainsl bin/device2grub bin/dhcp-edit bin/fai-chboot bin/faimond bin/faimond-gui bin/fcopy bin/install_packages bin/setup_harddisks bin/setup-storage examples/more-tests/tests/DSK_TEST_1 examples/more-tests/tests/DSK_TEST_2 examples/more-tests/tests/DSK_TEST_3 examples/more-tests/tests/DSK_TEST_4 examples/simple/tests/FAIBASE_TEST examples/simple/tests/Faitest.pm lib/dhclient-perl lib/fai-savelog-ftp utils/prtnetgr
+SHELL_SCRIPTS = lib/check_status lib/create_resolv_conf lib/updatebase lib/fai-abort lib/fai-divert lib/load_keymap_consolechars lib/disk-info lib/list_disks utils/mkdebmirror utils/create-nfsroot-tar utils/all_hosts utils/rshall bin/fai-start-stop-daemon bin/policy-rc.d.fai bin/dhclient-fai-script
+PERL_SCRIPTS = lib/setup-storage/*.pm bin/ainsl bin/device2grub bin/dhcp-edit bin/fai-chboot bin/faimond bin/faimond-gui bin/fcopy bin/install_packages bin/setup_harddisks bin/setup-storage examples/simple/tests/Faitest.pm lib/dhclient-perl lib/fai-savelog-ftp utils/prtnetgr
 
 # do not include .svn dir and setup-storage subdir
 libfiles=$(patsubst lib/setup-storage,,$(wildcard lib/[a-z]*))
@@ -27,6 +27,7 @@
 	@if [ -x "$$(which checkbashisms 2>/dev/null)" ]; then \
 		echo -n "Checking for bashisms"; \
 		for SCRIPT in $(SHELL_SCRIPTS); do \
+			test -r $${SCRIPT} || continue ; \
 			checkbashisms -f -x $${SCRIPT} || exit ; \
 			echo -n "."; \
 		done; \
@@ -40,20 +41,21 @@
 	fi
 
 shellcheck:
-	echo -n "Checking for shell syntax errors"; \
+	@echo -n "Checking for shell syntax errors"; \
 	for SCRIPT in $(BASH_SCRIPTS) $(SHELL_SCRIPTS); do \
+		test -r $${SCRIPT} || continue ; \
 		bash -n $${SCRIPT} || exit ; \
 		echo -n "."; \
 	done; \
 	echo " done."; \
 
 perlcheck:
-	echo -n "Checking for perl syntax errors"; \
+	@echo "Checking for perl syntax errors:"; \
 	for SCRIPT in $(PERL_SCRIPTS); do \
+		test -r $${SCRIPT} || continue ; \
 		perl -w -c $${SCRIPT} || exit ; \
-		echo -n "."; \
 	done; \
-	echo " done."; \
+	echo "-> perl check done."; \
 
 clean:
 	find -name svn-commit\*.tmp -o -name svn-commit.tmp~ | xargs -r rm