d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openmp-validation: unify and consolidate the patch 

openmp-validation-2-test-crlf.patch  was the only file
with \r byte in Copyright Header.

See https://github.com/mxe/mxe/issues/1500
This commit is contained in:
Boris Nagaev 2016-08-22 22:38:22 +03:00
parent ac82d048b2
commit 1b4b98c918
2 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/openmp-validation-1-fixes.patch
View File

@ -1,10 +1,19 @@
This file is part of MXE.
See index.html for further information.
diff -u OpenMP3.1_Validation/Makefile OpenMP3.1_Validation.new/Makefile
--- OpenMP3.1_Validation/Makefile 2013-07-18 00:19:20.000000000 +1000
+++ OpenMP3.1_Validation.new/Makefile 2014-02-22 16:23:37.000000000 +1100
@@ -185,14 +185,21 @@
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 23 Feb 2014 05:22:26 +1100
Subject: [PATCH] Overwrite built-in rules to allow .exe suffix
diff --git a/Makefile b/Makefile
index 1111111..2222222 100644
--- a/Makefile
+++ b/Makefile
@@ -185,14 +185,21 @@ omp_testsuite.h: ompts-c.conf c/*
.c.o: omp_testsuite omp_my_sleep
$(CC) $(CFLAGS) -c $<
@ -28,12 +37,10 @@ diff -u OpenMP3.1_Validation/Makefile OpenMP3.1_Validation.new/Makefile
print_compile_options:
@echo "-------------------"
Only in OpenMP3.1_Validation.new: bin
Common subdirectories: OpenMP3.1_Validation/c and OpenMP3.1_Validation.new/c
Common subdirectories: OpenMP3.1_Validation/fortran and OpenMP3.1_Validation.new/fortran
diff -u OpenMP3.1_Validation/omp_my_sleep.h OpenMP3.1_Validation.new/omp_my_sleep.h
--- OpenMP3.1_Validation/omp_my_sleep.h 2013-07-18 00:19:04.000000000 +1000
+++ OpenMP3.1_Validation.new/omp_my_sleep.h 2014-02-22 15:07:33.000000000 +1100
diff --git a/omp_my_sleep.h b/omp_my_sleep.h
index 1111111..2222222 100644
--- a/omp_my_sleep.h
+++ b/omp_my_sleep.h
@@ -5,7 +5,6 @@
#include<stdlib.h>
#include<unistd.h>
@ -42,5 +49,56 @@ diff -u OpenMP3.1_Validation/omp_my_sleep.h OpenMP3.1_Validation.new/omp_my_slee
#include <sys/time.h>
#include <time.h>
#include <errno.h>
Only in OpenMP3.1_Validation.new: ompts.log
Only in OpenMP3.1_Validation.new: results.txt
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 23 Feb 2014 05:22:26 +1100
Subject: [PATCH] add Batchfile with test to run on host
diff --git a/all-tests-openmp-validation.bat b/all-tests-openmp-validation.bat
new file mode 100644
index 1111111..2222222
--- /dev/null
+++ b/all-tests-openmp-validation.bat
@@ -0,0 +1,40 @@
+setlocal enableextensions enabledelayedexpansion
+set /a TEST_COUNT=0
+set /a FAIL_COUNT=0
+set /a PASS_COUNT=0
+set LOG_FILE=%~n0.log
+set BLANK=
+for /l %%I in (1,1,79) do set SPACER=%BLANK% %BLANK%!SPACER!
+date /t > %LOG_FILE%
+time /t >> %LOG_FILE%
+echo. >> %LOG_FILE%
+echo L=Language (c=c, n=fortran) >> %LOG_FILE%
+echo Pass 0=Y >> %LOG_FILE%
+echo. >> %LOG_FILE%
+echo L Test Name %SPACER:~0,50% Pass Certainty%%>> %LOG_FILE%
+echo %SPACER: =-%>> %LOG_FILE%
+for /r %%F in (test*.exe) do (
+ set /a TEST_COUNT += 1
+ %%F
+ set ERR=!errorlevel!
+ if !ERR! neq 0 (set /a FAIL_COUNT += 1) else set /a PASS_COUNT += 1
+ set TEST_LANG=%%~pF
+ set TEST_NAME=%%~nF%SPACER%
+ set ERR_SPC=!ERR!%SPACER%
+ set /p "=!TEST_LANG:~-2,-1! !TEST_NAME:~0,60! !ERR_SPC:~0,5! " < nul >> %LOG_FILE%
+ %%~dpFc%%~nxF
+ echo !errorlevel!%% >> %LOG_FILE%
+ if exist %%~dpForph_%%~nxF (
+ set /a TEST_COUNT += 1
+ %%~dpForph_%%~nxF
+ set ERR=!errorlevel!
+ if !ERR! neq 0 (set /a FAIL_COUNT += 1) else set /a PASS_COUNT += 1
+ set TEST_NAME=orph_%%~nF%SPACER%
+ set ERR_SPC=!ERR!%SPACER%
+ set /p "=!TEST_LANG:~-2,-1! !TEST_NAME:~0,60! !ERR_SPC:~0,5! " < nul >> %LOG_FILE%
+ %%~dpForph_c%%~nxF
+ echo !errorlevel!%% >> %LOG_FILE%
+ )
+)
+echo. >> %LOG_FILE%
+echo Total tests: !TEST_COUNT! Total Failed: !FAIL_COUNT! Total Passed: !PASS_COUNT!>> %LOG_FILE%

47
src/openmp-validation-2-test-crlf.patch
View File

@ -1,47 +0,0 @@
This file is part of MXE.
See index.html for further information.
diff -urN OpenMP3.1_Validation.orig/all-tests-openmp-validation.bat OpenMP3.1_Validation/all-tests-openmp-validation.bat
--- OpenMP3.1_Validation.orig/all-tests-openmp-validation.bat 1970-01-01 10:00:00.000000000 +1000
+++ OpenMP3.1_Validation/all-tests-openmp-validation.bat 2014-02-23 04:35:51.000000000 +1100
@@ -0,0 +1,40 @@
+setlocal enableextensions enabledelayedexpansion
+set /a TEST_COUNT=0
+set /a FAIL_COUNT=0
+set /a PASS_COUNT=0
+set LOG_FILE=%~n0.log
+set BLANK=
+for /l %%I in (1,1,79) do set SPACER=%BLANK% %BLANK%!SPACER!
+date /t > %LOG_FILE%
+time /t >> %LOG_FILE%
+echo. >> %LOG_FILE%
+echo L=Language (c=c, n=fortran) >> %LOG_FILE%
+echo Pass 0=Y >> %LOG_FILE%
+echo. >> %LOG_FILE%
+echo L Test Name %SPACER:~0,50% Pass Certainty%%>> %LOG_FILE%
+echo %SPACER: =-%>> %LOG_FILE%
+for /r %%F in (test*.exe) do (
+ set /a TEST_COUNT += 1
+ %%F
+ set ERR=!errorlevel!
+ if !ERR! neq 0 (set /a FAIL_COUNT += 1) else set /a PASS_COUNT += 1
+ set TEST_LANG=%%~pF
+ set TEST_NAME=%%~nF%SPACER%
+ set ERR_SPC=!ERR!%SPACER%
+ set /p "=!TEST_LANG:~-2,-1! !TEST_NAME:~0,60! !ERR_SPC:~0,5! " < nul >> %LOG_FILE%
+ %%~dpFc%%~nxF
+ echo !errorlevel!%% >> %LOG_FILE%
+ if exist %%~dpForph_%%~nxF (
+ set /a TEST_COUNT += 1
+ %%~dpForph_%%~nxF
+ set ERR=!errorlevel!
+ if !ERR! neq 0 (set /a FAIL_COUNT += 1) else set /a PASS_COUNT += 1
+ set TEST_NAME=orph_%%~nF%SPACER%
+ set ERR_SPC=!ERR!%SPACER%
+ set /p "=!TEST_LANG:~-2,-1! !TEST_NAME:~0,60! !ERR_SPC:~0,5! " < nul >> %LOG_FILE%
+ %%~dpForph_c%%~nxF
+ echo !errorlevel!%% >> %LOG_FILE%
+ )
+)
+echo. >> %LOG_FILE%
+echo Total tests: !TEST_COUNT! Total Failed: !FAIL_COUNT! Total Passed: !PASS_COUNT!>> %LOG_FILE%