[Refactor:Autograding] Cleanup make output log (Submitty#8333)

fix: cleanup make log Co-authored-by: TKoz[0] <[email protected]>
ziesski · Feb 28, 2023 · 5bcd9e2 · 5bcd9e2
1 parent eea4012
commit 5bcd9e2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/bin/build_homework_function.sh b/bin/build_homework_function.sh
@@ -222,12 +222,10 @@ function build_homework {
 
     # capture exit code of make
     make_res="$?"
-    chmod -f 660 "$hw_build_path/log_make_output.txt"
     find "$hw_build_path" -type d -exec chmod -f ug+rwx,g+s,o= {} \;
     find "$hw_build_path" -type f -exec chmod -f ug+rw,o= {} \;
     if (( "$make_res" != 0 )); then
-        echo -e "\nMAKE ERROR\nlogfile: $hw_build_path/log_make_output.txt\n\n"
-        cat "$hw_build_path/log_make_output.txt"
+        echo -e "\nMAKE ERROR\n\n"
         fix_permissions "$hw_config" "$hw_bin_path" "$hw_build_path" "$course_dir" "$assignment" "$course_group"
         popd > /dev/null
         exit 1

diff --git a/site/app/controllers/admin/AdminGradeableController.php b/site/app/controllers/admin/AdminGradeableController.php
@@ -1349,10 +1349,8 @@ public function getBuildLogs(string $gradeable_id): JsonResponse {
         $build_script_output = is_file($build_script_output_file) ? htmlentities(file_get_contents($build_script_output_file)) : null;
         $cmake_out_dir = FileUtils::joinPaths($this->core->getConfig()->getCoursePath(), 'build', $gradeable_id, 'log_cmake_output.txt');
         $cmake_output = is_file($cmake_out_dir) ? htmlentities(file_get_contents($cmake_out_dir)) : null;
-        $make_out_dir = FileUtils::joinPaths($this->core->getConfig()->getCoursePath(), 'build', $gradeable_id, 'log_make_output.txt');
-        $make_output = is_file($make_out_dir) ? htmlentities(file_get_contents($make_out_dir)) : null;
 
-        return JsonResponse::getSuccessResponse([$build_script_output,$cmake_output,$make_output]);
+        return JsonResponse::getSuccessResponse([$build_script_output,$cmake_output]);
     }
 
     /**

diff --git a/site/app/templates/admin/admin_gradeable/AdminGradeableAuto.twig b/site/app/templates/admin/admin_gradeable/AdminGradeableAuto.twig
@@ -134,11 +134,6 @@
         <pre id="cmake-log-body"></pre>
     </div>
 
-    <div class="log-container" hidden>
-        <div class="option-title">Make output:</div>
-        <pre id="make-log-body"></pre>
-    </div>
-
 </div>
 
 <script>

diff --git a/site/public/js/admin-gradeable-updates.js b/site/public/js/admin-gradeable-updates.js
@@ -326,7 +326,6 @@ function ajaxGetBuildLogs(gradeable_id) {
         success: function (response) {
             var build_info = response['data'][0];
             var cmake_info = response['data'][1];
-            var make_info = response['data'][2];
 
             if (build_info != null) {
                 $('#build-log-body').html(build_info);
@@ -340,12 +339,6 @@ function ajaxGetBuildLogs(gradeable_id) {
             else {
                 $('#cmake-log-body').html('There is currently no cmake output.');
             }
-            if (make_info != null) {
-                $('#make-log-body').html(make_info);
-            }
-            else {
-                $('#make-log-body').html('There is currently no make output.');
-            }
 
             $('.log-container').show();
             $('#open-build-log').hide();