Merge pull request #295 from NOAA-GFDL/224.fre-make-compile-test

224.fre make compile test

.gitignore

@@ -66,6 +66,10 @@ fre/tests/test_files/outdirfre/
 fre/pp/tests/configure_yaml_out/
 fre/yamltools/tests/combine_yamls_out/
 fre/app/generate_time_averages/tests/time_avg_test_files/
+fre/make/tests/null_example/combined-null_model.yaml
+fre/make/tests/makefile_out
+fre/make/tests/compile_out
+fre/tests/fremake_out
 
 # Translations
 *.mo

fre/make/create_compile_script.py

@@ -16,7 +16,6 @@ def compile_create(yamlfile, platform, target, jobs, parallel, execute, verbose)
     name = yamlfile.split(".")[0]
     nparallel = parallel
     jobs = str(jobs)
-    run = execute
 
     if verbose:
       logging.basicCOnfig(level=logging.INFO)
@@ -80,13 +79,14 @@ def compile_create(yamlfile, platform, target, jobs, parallel, execute, verbose)
                    fremakeBuild.writeBuildComponents(c)
               fremakeBuild.writeScript()
               fremakeBuildList.append(fremakeBuild)
-              print("\nCompile script created at " + bldDir + "/compile.sh" + "\n") #was click.echo
-    if run:
+              print("\nCompile script created at " + bldDir + "/compile.sh" + "\n")
+
+    if execute:
         if baremetalRun:
             pool = Pool(processes=nparallel)                         # Create a multiprocessing Pool
             pool.map(buildBaremetal.fremake_parallel,fremakeBuildList)  # process data_inputs iterable with pool
     else:
-        return #0 #sys.exit()
+        return
 
 if __name__ == "__main__":
     compile_create()

fre/make/gfdlfremake/platformfre.py

@@ -57,7 +57,6 @@ def __init__(self,platforminfo):
                     raise Exception("You must specify the program used to build the container (containerBuild) on the "+p["name"]+" platform in the file "+fname+"\n")
                 if p["containerBuild"] != "podman" and p["containerBuild"] != "docker":
                     raise ValueError("Container builds only supported with docker or podman, but you listed "+p["containerBuild"]+"\n")
-                print (p["containerBuild"])
 ## Check for container environment set up for RUN commands
                 try:
                     p["containerBase"]

fre/make/gfdlfremake/yamlfre.py

@@ -171,7 +171,6 @@ def __init__(self,combinedyaml,v):
 
         #get platform info
         self.platformsdict = self.freyaml.get("platforms")
-        print(self.platformsdict)
         self.platforms = platformfre.platforms(self.platformsdict)
         self.platformsyaml = self.platforms.getPlatformsYaml()