1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-27 23:41:18 +01:00

Merge pull request #11517 from cladmi/pr/compile_and_test_for_board/do_not_check_git

tools/compile_and_test_for_board: ignore git tracked or not
This commit is contained in:
Gaëtan Harter 2019-05-13 19:43:02 +02:00 committed by GitHub
commit 5bb49b673c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -113,7 +113,7 @@ def apps_directories(riotdir, apps_dirs=None, apps_dirs_skip=None):
:param apps_dirs_skip: list of application directories to remove, applied
on the RIOT list or `apps_dirs`
"""
apps_dirs = apps_dirs or _riot_tracked_applications_dirs(riotdir)
apps_dirs = apps_dirs or _riot_applications_dirs(riotdir)
apps_dirs_skip = apps_dirs_skip or []
# Remove applications to skip
@ -122,38 +122,6 @@ def apps_directories(riotdir, apps_dirs=None, apps_dirs_skip=None):
return sorted(list(apps_dirs))
def _is_git_repo(riotdir):
"""Check if directory is a git repository."""
cmd = ['git', 'rev-parse', '--git-dir']
ret = subprocess.call(cmd, cwd=riotdir,
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL)
return ret == 0
def _is_git_tracked(appdir):
"""Check if directory is a git repository."""
cmd = ['git', 'ls-files', '--error-unmatch', 'Makefile']
ret = subprocess.call(cmd, cwd=appdir,
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL)
return ret == 0
def _riot_tracked_applications_dirs(riotdir):
"""Applications directories in the RIOT repository with relative path.
Only return 'tracked' applications if riotdir is a git repository.
"""
apps_dirs = _riot_applications_dirs(riotdir)
# Only keep tracked directories
if _is_git_repo(riotdir):
apps_dirs = [dir for dir in apps_dirs
if _is_git_tracked(os.path.join(riotdir, dir))]
return apps_dirs
def _riot_applications_dirs(riotdir):
"""Applications directories in the RIOT repository with relative path."""
cmd = ['make', 'info-applications']