Merge branch 'privat' into contrib-pep8analysis
authorAlexis Laferrière <alexis.laf@xymus.net>
Mon, 31 Mar 2014 19:27:33 +0000 (15:27 -0400)
committerAlexis Laferrière <alexis.laf@xymus.net>
Mon, 31 Mar 2014 19:27:33 +0000 (15:27 -0400)
1  2 
lib/standard/collection/abstract_collection.nit
lib/standard/collection/array.nit
lib/standard/collection/hash_collection.nit
tests/niti.skip
tests/testfull.sh

Simple merge
diff --cc tests/niti.skip
@@@ -12,4 -11,5 +11,6 @@@ nitg_args
  nitg_args3
  nitg_args5
  nitg_args6
 +pep8analysis
+ test_android_platform
+ android
@@@ -6,4 -6,13 +6,14 @@@ d
        y="$x/$bx.nit"
        test -f $y && list="$list $y"
  done
- ./tests.sh "$@" *.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/src/shoot_logic.nit ../lib/*.nit $list ../src/nitdoc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitg.nit ../src/nitx.nit ../src/netdbg.nit ../src/nitlight.nit ../contrib/sort_downloads/src/sort_downloads.nit ../contrib/pep8analysis/src/pep8analysis.nit
+ ./tests.sh "$@" *.nit \
+       ../examples/*.nit \
+       ../examples/leapfrog/leapfrog.nit \
+       ../examples/shoot/src/shoot_logic.nit \
+       ../examples/*/src/*_android.nit \
+       ../examples/*/src/*_linux.nit \
+       ../lib/*.nit $list \
+       ../src/nit*.nit \
+       ../src/test_*.nit \
 -      ../contrib/sort_downloads/src/sort_downloads.nit
++      ../contrib/sort_downloads/src/sort_downloads.nit \
++      ../contrib/pep8analysis/src/pep8analysis.nit