Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some small cleanups for helper.py + a py3k fix (#1513)

This commit is contained in:
Alex Gaynor 2018-06-12 16:26:08 -07:00 committed by Oliver Chang
parent ee91487456
commit 1bfe76536e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infra/helper.py
View File

@ -22,13 +22,10 @@ import errno
import os import os
import pipes import pipes
import re import re
import shutil
import string
import subprocess import subprocess
import sys import sys
import tempfile import tempfile
import templates import templates
import time
OSSFUZZ_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) OSSFUZZ_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
BUILD_DIR = os.path.join(OSSFUZZ_DIR, 'build') BUILD_DIR = os.path.join(OSSFUZZ_DIR, 'build')
@ -46,6 +43,8 @@ BASE_IMAGES = [
VALID_PROJECT_NAME_REGEX = re.compile(r'^[a-zA-Z0-9_-]+$') VALID_PROJECT_NAME_REGEX = re.compile(r'^[a-zA-Z0-9_-]+$')
MAX_PROJECT_NAME_LENGTH = 26 MAX_PROJECT_NAME_LENGTH = 26
if sys.version_info[0] >= 3:
raw_input = input
def main(): def main():
os.chdir(OSSFUZZ_DIR) os.chdir(OSSFUZZ_DIR)
@ -541,7 +540,7 @@ def generate(args):
print('Writing new files to', dir) print('Writing new files to', dir)
template_args = { template_args = {
'project_name' : args.project_name, 'project_name': args.project_name,
'year': datetime.datetime.now().year 'year': datetime.datetime.now().year
} }
with open(os.path.join(dir, 'project.yaml'), 'w') as f: with open(os.path.join(dir, 'project.yaml'), 'w') as f:
@ -573,7 +572,7 @@ def shell(args):
if _is_base_image(args.project_name): if _is_base_image(args.project_name):
image_project = 'oss-fuzz-base' image_project = 'oss-fuzz-base'
out_dir = os.path.join(BUILD_DIR, 'out'); out_dir = os.path.join(BUILD_DIR, 'out')
else: else:
image_project = 'oss-fuzz' image_project = 'oss-fuzz'
out_dir = os.path.join(BUILD_DIR, 'out', args.project_name) out_dir = os.path.join(BUILD_DIR, 'out', args.project_name)