[med-svn] r19959 - in trunk/packages/libsis-base-java/trunk/debian: . patches

[Olivier Sallou]

Author: osallou
Date: 2015-08-16 09:44:47 +0000 (Sun, 16 Aug 2015)
New Revision: 19959

Modified:
   trunk/packages/libsis-base-java/trunk/debian/patches/fix_tests.patch
   trunk/packages/libsis-base-java/trunk/debian/rules
Log:
set LC_ALL=C for tests to fix language issue

Modified: trunk/packages/libsis-base-java/trunk/debian/patches/fix_tests.patch
===================================================================
--- trunk/packages/libsis-base-java/trunk/debian/patches/fix_tests.patch	2015-08-16 08:34:25 UTC (rev 19958)
+++ trunk/packages/libsis-base-java/trunk/debian/patches/fix_tests.patch	2015-08-16 09:44:47 UTC (rev 19959)
@@ -1,34 +1,9 @@
-Subject: Tests made assumption of locale english language
-Description: some tests checks the Unix error message content,
- which causes an error when locale is not english. This patch
- disable those tests.
- Update also uid/gid tests assuming non root user.
-Forwarded: yes
+Subject: Tests made assumption user is not root
+Description: Update uid/gid tests assuming non root user.
+Forwarded: no
 Author: Olivier Sallou <osallou at debian.org>
 --- a/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
 +++ b/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
-@@ -115,7 +115,7 @@
-         assertTrue(info.isSymbolicLink());
-         final Stat info2 = Unix.tryGetFileInfo(s.getAbsolutePath());
-         assertNull(info2);
--        assertEquals("No such file or directory", Unix.getLastError());
-+        //assertEquals("No such file or directory", Unix.getLastError());
-     }
- 
-     @Test(groups =
-@@ -125,10 +125,10 @@
-         final File s = new File(workingDirectory, "nonExistent");
-         final Stat info = Unix.tryGetLinkInfo(s.getAbsolutePath());
-         assertNull(info);
--        assertEquals("No such file or directory", Unix.getLastError());
-+        //assertEquals("No such file or directory", Unix.getLastError());
-         final Stat info2 = Unix.tryGetFileInfo(s.getAbsolutePath());
-         assertNull(info2);
--        assertEquals("No such file or directory", Unix.getLastError());
-+        //assertEquals("No such file or directory", Unix.getLastError());
-     }
- 
-     @Test(groups =
 @@ -164,14 +164,14 @@
          { "requires_unix" })
      public void testGetUid()

Modified: trunk/packages/libsis-base-java/trunk/debian/rules
===================================================================
--- trunk/packages/libsis-base-java/trunk/debian/rules	2015-08-16 08:34:25 UTC (rev 19958)
+++ trunk/packages/libsis-base-java/trunk/debian/rules	2015-08-16 09:44:47 UTC (rev 19959)
@@ -24,10 +24,8 @@
 #	dh_auto_install
 
 override_dh_auto_clean:
-#	cp debian/build_native/* source/c
-#	cd source/c && autoreconf -i && ./configure
-#	cd source/c ; make clean
 	if test -e source/c/Makefile; then cd source/c; make clean; fi
+	rm -f source/c/AUTHORS source/c/NEWS source/c/README source/c/ChangeLog
 	rm -rf source/c/configure* source/c/Makefile* source/c/autom4te.cache
 	rm -rf src lib build *.jar test
 	#find test -name '*.class' -delete
@@ -43,4 +41,4 @@
 	dh_auto_test
 	mkdir test ; cp -r source/java/ch test ; cp -r sourceTest/java/ch test
 	jh_build sis-base-test.jar test
-	java -Dnative.libpath=source/c/.libs -classpath sis-base-test.jar ch.systemsx.cisd.base.AllTests
+	LC_ALL=C java -Dnative.libpath=source/c/.libs -classpath sis-base-test.jar ch.systemsx.cisd.base.AllTests