some test fixes and refinements

pytest/__init__.py

@@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
 
 (c) Holger Krekel and others, 2004-2010
 """
-__version__ = '2.0.0.dev14'
+__version__ = '2.0.0.dev15'
 
 __all__ = ['config', 'cmdline']
 

pytest/plugin/config.py

@@ -297,7 +297,7 @@ class Config(object):
         if self.inicfg:
             newargs = self.inicfg.get("addargs", None)
             if newargs:
-                args[:] = args + py.std.shlex.split(newargs)
+                args[:] = py.std.shlex.split(newargs) + args
         self._checkversion()
         self.pluginmanager.consider_setuptools_entrypoints()
         self.pluginmanager.consider_env()
@@ -414,6 +414,7 @@ class Config(object):
 
 
 def getcfg(args, inibasenames):
+    args = [x for x in args if str(x)[0] != "-"]
     if not args:
         args = [py.path.local()]
     for inibasename in inibasenames: