From f2d456011646c08d70dcd9cd4e7d41a2556ae333 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 12 Jun 2026 10:21:20 +0200 Subject: [PATCH] Update Linefeed --- test/quota/DQTC.BAT | 122 ++++++++++++++--------------- test/quota/DQTSTA.BAT | 174 +++++++++++++++++++++--------------------- test/quota/DQTZIP.BAT | 38 ++++----- 3 files changed, 167 insertions(+), 167 deletions(-) diff --git a/test/quota/DQTC.BAT b/test/quota/DQTC.BAT index 06f7db9..ea0ab79 100644 --- a/test/quota/DQTC.BAT +++ b/test/quota/DQTC.BAT @@ -1,61 +1,61 @@ -@ECHO OFF -REM DQTC.BAT -REM Run as NOPASSUSER after Linux-side quota setup. - -F: -CD \ -IF NOT EXIST DQTCMP\NUL MD DQTCMP -IF NOT EXIST DQTCMP\DOS\NUL MD DQTCMP\DOS -IF NOT EXIST DQTTEST\NCPQFILL\NUL MD DQTTEST\NCPQFILL -IF EXIST F:\DQTCMP\PASS.TAG DEL F:\DQTCMP\PASS.TAG -IF EXIST F:\DQTCMP\FAIL.TAG DEL F:\DQTCMP\FAIL.TAG -IF EXIST F:\DQTCMP\DOS\WRITE.LOG DEL F:\DQTCMP\DOS\WRITE.LOG - -ECHO DQTC DOS quota write test as current user > F:\DQTCMP\DOS\WRITE.LOG -ECHO Writing 12 allowed 4K files. >> F:\DQTCMP\DOS\WRITE.LOG - -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00001.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00002.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00003.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00004.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00005.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00006.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00007.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00008.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00009.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00010.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00011.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00012.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO FAILGOOD - -ECHO Attempting expected failing 13th 4K file. >> F:\DQTCMP\DOS\WRITE.LOG -PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\QFAIL.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG -IF ERRORLEVEL 1 GOTO PASS - -ECHO FAIL: expected QFAIL.BIN to be denied, but it succeeded. >> F:\DQTCMP\DOS\WRITE.LOG -ECHO FAIL > F:\DQTCMP\FAIL.TAG -GOTO END - -:FAILGOOD -ECHO FAIL: an allowed 4K write failed before the quota boundary. >> F:\DQTCMP\DOS\WRITE.LOG -ECHO FAIL > F:\DQTCMP\FAIL.TAG -GOTO END - -:PASS -ECHO PASS: 13th 4K file was denied. >> F:\DQTCMP\DOS\WRITE.LOG -ECHO PASS > F:\DQTCMP\PASS.TAG -GOTO END - -:END -TYPE F:\DQTCMP\DOS\WRITE.LOG +@ECHO OFF +REM DQTC.BAT +REM Run as NOPASSUSER after Linux-side quota setup. + +F: +CD \ +IF NOT EXIST DQTCMP\NUL MD DQTCMP +IF NOT EXIST DQTCMP\DOS\NUL MD DQTCMP\DOS +IF NOT EXIST DQTTEST\NCPQFILL\NUL MD DQTTEST\NCPQFILL +IF EXIST F:\DQTCMP\PASS.TAG DEL F:\DQTCMP\PASS.TAG +IF EXIST F:\DQTCMP\FAIL.TAG DEL F:\DQTCMP\FAIL.TAG +IF EXIST F:\DQTCMP\DOS\WRITE.LOG DEL F:\DQTCMP\DOS\WRITE.LOG + +ECHO DQTC DOS quota write test as current user > F:\DQTCMP\DOS\WRITE.LOG +ECHO Writing 12 allowed 4K files. >> F:\DQTCMP\DOS\WRITE.LOG + +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00001.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00002.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00003.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00004.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00005.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00006.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00007.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00008.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00009.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00010.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00011.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\Q00012.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO FAILGOOD + +ECHO Attempting expected failing 13th 4K file. >> F:\DQTCMP\DOS\WRITE.LOG +PUBLIC\TESTS WRITE4K F:\DQTTEST\NCPQFILL\QFAIL.BIN 1 >> F:\DQTCMP\DOS\WRITE.LOG +IF ERRORLEVEL 1 GOTO PASS + +ECHO FAIL: expected QFAIL.BIN to be denied, but it succeeded. >> F:\DQTCMP\DOS\WRITE.LOG +ECHO FAIL > F:\DQTCMP\FAIL.TAG +GOTO END + +:FAILGOOD +ECHO FAIL: an allowed 4K write failed before the quota boundary. >> F:\DQTCMP\DOS\WRITE.LOG +ECHO FAIL > F:\DQTCMP\FAIL.TAG +GOTO END + +:PASS +ECHO PASS: 13th 4K file was denied. >> F:\DQTCMP\DOS\WRITE.LOG +ECHO PASS > F:\DQTCMP\PASS.TAG +GOTO END + +:END +TYPE F:\DQTCMP\DOS\WRITE.LOG diff --git a/test/quota/DQTSTA.BAT b/test/quota/DQTSTA.BAT index 0b32c3f..b46994a 100644 --- a/test/quota/DQTSTA.BAT +++ b/test/quota/DQTSTA.BAT @@ -1,87 +1,87 @@ -@ECHO OFF -REM DQTSTA.BAT -REM DOS-side quota write-deny smoke for MARS-NWE. -REM -REM This is intentionally a mixed Linux/DOS test: -REM 1. Run DQTSTA PREP as SUPERVISOR from the target volume. -REM 2. On Linux set the volume userquota for NOPASSUSER. -REM 3. Login as NOPASSUSER and run DQTC.BAT from this directory. -REM 4. Login as SUPERVISOR and run DQTSTA PART2, then DQTZIP. - -IF "%1"=="" GOTO PREP -IF "%1"=="PREP" GOTO PREP -IF "%1"=="prep" GOTO PREP -IF "%1"=="PART2" GOTO PART2 -IF "%1"=="part2" GOTO PART2 -ECHO Usage: DQTSTA [PREP^|PART2] -GOTO END - -:PREP -F: -CD \ - -IF EXIST DQTTEST\NUL DELTREE /Y DQTTEST\*.* -IF EXIST DQTCMP\NUL DELTREE /Y DQTCMP\*.* -IF NOT EXIST DQTTEST\NUL MD DQTTEST -IF NOT EXIST DQTTEST\NCPQFILL\NUL MD DQTTEST\NCPQFILL -IF NOT EXIST DQTCMP\NUL MD DQTCMP -IF NOT EXIST DQTCMP\DOS\NUL MD DQTCMP\DOS -IF NOT EXIST DQTCMP\SETUP\NUL MD DQTCMP\SETUP - -IF EXIST F:\DQTCMP\RUN.LOG DEL F:\DQTCMP\RUN.LOG -IF EXIST F:\DQTCMP\SUMMARY.TXT DEL F:\DQTCMP\SUMMARY.TXT -IF EXIST F:\DQTCMP\FAIL.TAG DEL F:\DQTCMP\FAIL.TAG -IF EXIST F:\DQTCMP\PASS.TAG DEL F:\DQTCMP\PASS.TAG -IF EXIST F:\DQTCMP\DQTSTA.ZIP DEL F:\DQTCMP\DQTSTA.ZIP -IF EXIST F:\DQTCMP\ZIP.LOG DEL F:\DQTCMP\ZIP.LOG -IF EXIST F:\DQTCMP\DOS\*.OUT DEL F:\DQTCMP\DOS\*.OUT - -ECHO DQTSTA DOS quota write-deny smoke > F:\DQTCMP\RUN.LOG -ECHO Volume-side setup is done from DOS. Quota limit is set from Linux. >> F:\DQTCMP\RUN.LOG -ECHO Expected Linux setup: userquota for NOPASSUSER allows 12x4K, then DOS write 13th file fails. >> F:\DQTCMP\RUN.LOG -ECHO. >> F:\DQTCMP\RUN.LOG - -REM Give the normal user enough rights to create files and write result logs. -IF EXIST F:\NPUBLIC\GRANT.EXE GOTO HAVEGRANT -ECHO ERROR: F:\NPUBLIC\GRANT.EXE not found. >> F:\DQTCMP\RUN.LOG -ECHO ERROR: F:\NPUBLIC\GRANT.EXE not found. -GOTO END - -:HAVEGRANT -NPUBLIC\GRANT R W C E M F A FOR F:\DQTTEST TO USER NOPASSUSER > F:\DQTCMP\SETUP\GRANT1.OUT -NPUBLIC\GRANT R W C E M F A FOR F:\DQTTEST\NCPQFILL TO USER NOPASSUSER > F:\DQTCMP\SETUP\GRANT2.OUT -NPUBLIC\GRANT R W C E M F A FOR F:\DQTCMP TO USER NOPASSUSER > F:\DQTCMP\SETUP\GRANT3.OUT -NPUBLIC\RIGHTS F:\DQTTEST\NCPQFILL > F:\DQTCMP\SETUP\RIGHTS.OUT - -ECHO === NEXT LINUX STEP === > F:\DQTCMP\LINUX.TXT -ECHO Set volume userquota for NOPASSUSER to 12x4K on this volume. >> F:\DQTCMP\LINUX.TXT -ECHO Then login as NOPASSUSER and run: >> F:\DQTCMP\LINUX.TXT -ECHO F:\DQTC.BAT >> F:\DQTCMP\LINUX.TXT -ECHO Then login as SUPERVISOR and run: >> F:\DQTCMP\LINUX.TXT -ECHO F:\DQTSTA.BAT PART2 >> F:\DQTCMP\LINUX.TXT - -ECHO DQTSTA PREP finished. >> F:\DQTCMP\RUN.LOG -ECHO. -ECHO DQTSTA PREP fertig. -ECHO Jetzt Linux quota fuer NOPASSUSER setzen, dann als NOPASSUSER F:\DQTC.BAT starten. -GOTO END - -:PART2 -F: -CD \ -IF NOT EXIST DQTCMP\NUL MD DQTCMP - -ECHO DQTSTA PART2 summary > F:\DQTCMP\SUMMARY.TXT -IF EXIST F:\DQTCMP\PASS.TAG ECHO PASS: DOS quota deny observed. >> F:\DQTCMP\SUMMARY.TXT -IF EXIST F:\DQTCMP\FAIL.TAG ECHO FAIL: DOS quota deny was not observed. >> F:\DQTCMP\SUMMARY.TXT -IF NOT EXIST F:\DQTCMP\PASS.TAG IF NOT EXIST F:\DQTCMP\FAIL.TAG ECHO UNKNOWN: DQTC.BAT result tags missing. >> F:\DQTCMP\SUMMARY.TXT -ECHO. >> F:\DQTCMP\SUMMARY.TXT -ECHO DOS log files are in F:\DQTCMP\DOS. >> F:\DQTCMP\SUMMARY.TXT -ECHO Linux/nw.log evidence should be collected with the matching mars-nwe smoke wrapper. >> F:\DQTCMP\SUMMARY.TXT - -ECHO. -TYPE F:\DQTCMP\SUMMARY.TXT -ECHO Optional: run DQTZIP. -GOTO END - -:END +@ECHO OFF +REM DQTSTA.BAT +REM DOS-side quota write-deny smoke for MARS-NWE. +REM +REM This is intentionally a mixed Linux/DOS test: +REM 1. Run DQTSTA PREP as SUPERVISOR from the target volume. +REM 2. On Linux set the volume userquota for NOPASSUSER. +REM 3. Login as NOPASSUSER and run DQTC.BAT from this directory. +REM 4. Login as SUPERVISOR and run DQTSTA PART2, then DQTZIP. + +IF "%1"=="" GOTO PREP +IF "%1"=="PREP" GOTO PREP +IF "%1"=="prep" GOTO PREP +IF "%1"=="PART2" GOTO PART2 +IF "%1"=="part2" GOTO PART2 +ECHO Usage: DQTSTA [PREP^|PART2] +GOTO END + +:PREP +F: +CD \ + +IF EXIST DQTTEST\NUL DELTREE /Y DQTTEST\*.* +IF EXIST DQTCMP\NUL DELTREE /Y DQTCMP\*.* +IF NOT EXIST DQTTEST\NUL MD DQTTEST +IF NOT EXIST DQTTEST\NCPQFILL\NUL MD DQTTEST\NCPQFILL +IF NOT EXIST DQTCMP\NUL MD DQTCMP +IF NOT EXIST DQTCMP\DOS\NUL MD DQTCMP\DOS +IF NOT EXIST DQTCMP\SETUP\NUL MD DQTCMP\SETUP + +IF EXIST F:\DQTCMP\RUN.LOG DEL F:\DQTCMP\RUN.LOG +IF EXIST F:\DQTCMP\SUMMARY.TXT DEL F:\DQTCMP\SUMMARY.TXT +IF EXIST F:\DQTCMP\FAIL.TAG DEL F:\DQTCMP\FAIL.TAG +IF EXIST F:\DQTCMP\PASS.TAG DEL F:\DQTCMP\PASS.TAG +IF EXIST F:\DQTCMP\DQTSTA.ZIP DEL F:\DQTCMP\DQTSTA.ZIP +IF EXIST F:\DQTCMP\ZIP.LOG DEL F:\DQTCMP\ZIP.LOG +IF EXIST F:\DQTCMP\DOS\*.OUT DEL F:\DQTCMP\DOS\*.OUT + +ECHO DQTSTA DOS quota write-deny smoke > F:\DQTCMP\RUN.LOG +ECHO Volume-side setup is done from DOS. Quota limit is set from Linux. >> F:\DQTCMP\RUN.LOG +ECHO Expected Linux setup: userquota for NOPASSUSER allows 12x4K, then DOS write 13th file fails. >> F:\DQTCMP\RUN.LOG +ECHO. >> F:\DQTCMP\RUN.LOG + +REM Give the normal user enough rights to create files and write result logs. +IF EXIST F:\NPUBLIC\GRANT.EXE GOTO HAVEGRANT +ECHO ERROR: F:\NPUBLIC\GRANT.EXE not found. >> F:\DQTCMP\RUN.LOG +ECHO ERROR: F:\NPUBLIC\GRANT.EXE not found. +GOTO END + +:HAVEGRANT +NPUBLIC\GRANT R W C E M F A FOR F:\DQTTEST TO USER NOPASSUSER > F:\DQTCMP\SETUP\GRANT1.OUT +NPUBLIC\GRANT R W C E M F A FOR F:\DQTTEST\NCPQFILL TO USER NOPASSUSER > F:\DQTCMP\SETUP\GRANT2.OUT +NPUBLIC\GRANT R W C E M F A FOR F:\DQTCMP TO USER NOPASSUSER > F:\DQTCMP\SETUP\GRANT3.OUT +NPUBLIC\RIGHTS F:\DQTTEST\NCPQFILL > F:\DQTCMP\SETUP\RIGHTS.OUT + +ECHO === NEXT LINUX STEP === > F:\DQTCMP\LINUX.TXT +ECHO Set volume userquota for NOPASSUSER to 12x4K on this volume. >> F:\DQTCMP\LINUX.TXT +ECHO Then login as NOPASSUSER and run: >> F:\DQTCMP\LINUX.TXT +ECHO F:\DQTC.BAT >> F:\DQTCMP\LINUX.TXT +ECHO Then login as SUPERVISOR and run: >> F:\DQTCMP\LINUX.TXT +ECHO F:\DQTSTA.BAT PART2 >> F:\DQTCMP\LINUX.TXT + +ECHO DQTSTA PREP finished. >> F:\DQTCMP\RUN.LOG +ECHO. +ECHO DQTSTA PREP fertig. +ECHO Jetzt Linux quota fuer NOPASSUSER setzen, dann als NOPASSUSER F:\DQTC.BAT starten. +GOTO END + +:PART2 +F: +CD \ +IF NOT EXIST DQTCMP\NUL MD DQTCMP + +ECHO DQTSTA PART2 summary > F:\DQTCMP\SUMMARY.TXT +IF EXIST F:\DQTCMP\PASS.TAG ECHO PASS: DOS quota deny observed. >> F:\DQTCMP\SUMMARY.TXT +IF EXIST F:\DQTCMP\FAIL.TAG ECHO FAIL: DOS quota deny was not observed. >> F:\DQTCMP\SUMMARY.TXT +IF NOT EXIST F:\DQTCMP\PASS.TAG IF NOT EXIST F:\DQTCMP\FAIL.TAG ECHO UNKNOWN: DQTC.BAT result tags missing. >> F:\DQTCMP\SUMMARY.TXT +ECHO. >> F:\DQTCMP\SUMMARY.TXT +ECHO DOS log files are in F:\DQTCMP\DOS. >> F:\DQTCMP\SUMMARY.TXT +ECHO Linux/nw.log evidence should be collected with the matching mars-nwe smoke wrapper. >> F:\DQTCMP\SUMMARY.TXT + +ECHO. +TYPE F:\DQTCMP\SUMMARY.TXT +ECHO Optional: run DQTZIP. +GOTO END + +:END diff --git a/test/quota/DQTZIP.BAT b/test/quota/DQTZIP.BAT index 35bcae3..6616a61 100644 --- a/test/quota/DQTZIP.BAT +++ b/test/quota/DQTZIP.BAT @@ -1,19 +1,19 @@ -@ECHO OFF -REM DQTZIP.BAT -REM Optional packer for DOS quota smoke result files. - -F: -CD \DQTCMP - -IF EXIST DQTSTA.ZIP DEL DQTSTA.ZIP -IF EXIST ZIP.LOG DEL ZIP.LOG - -ECHO Creating DQTSTA.ZIP > ZIP.LOG -ZIP -r DQTSTA.ZIP RUN.LOG SUMMARY.TXT LINUX.TXT PASS.TAG FAIL.TAG DOS SETUP >> ZIP.LOG - -ECHO. -ECHO ZIP step finished. -ECHO Check: -ECHO F:\DQTCMP\DQTSTA.ZIP -ECHO F:\DQTCMP\ZIP.LOG -ECHO. +@ECHO OFF +REM DQTZIP.BAT +REM Optional packer for DOS quota smoke result files. + +F: +CD \DQTCMP + +IF EXIST DQTSTA.ZIP DEL DQTSTA.ZIP +IF EXIST ZIP.LOG DEL ZIP.LOG + +ECHO Creating DQTSTA.ZIP > ZIP.LOG +ZIP -r DQTSTA.ZIP RUN.LOG SUMMARY.TXT LINUX.TXT PASS.TAG FAIL.TAG DOS SETUP >> ZIP.LOG + +ECHO. +ECHO ZIP step finished. +ECHO Check: +ECHO F:\DQTCMP\DQTSTA.ZIP +ECHO F:\DQTCMP\ZIP.LOG +ECHO.