From 7b209234f00e56950cc2025e64e6dc8b4569fccc Mon Sep 17 00:00:00 2001
From: ballen4705 <ballen4705@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Mon, 1 Dec 2003 22:24:31 +0000
Subject: [PATCH] Long test BEFORE short test
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1328 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/smartd.c | 10 +++++-----
sm5/smartd.cpp | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/sm5/smartd.c b/sm5/smartd.c
index 42f6101c1..c365061f3 100644
--- a/sm5/smartd.c
+++ b/sm5/smartd.c
@@ -69,7 +69,7 @@
extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid,
*knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
-const char *smartd_c_cvsid="$Id: smartd.c,v 1.251 2003/12/01 21:53:43 ballen4705 Exp $"
+const char *smartd_c_cvsid="$Id: smartd.c,v 1.252 2003/12/01 22:24:31 ballen4705 Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID
SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
@@ -1646,11 +1646,11 @@ int SCSICheckDevice(cfgfile *cfg)
// Doug, here's where you add scheduled self-tests
if (cfg->testregexp) {
// short test
- if (DoTestNow(cfg, 'S')>0)
- DoSCSISelfTest(fd, cfg, 'S');
- // long test
- else if (DoTestNow(cfg, 'L')>0)
+ if (DoTestNow(cfg, 'L')>0)
DoSCSISelfTest(fd, cfg, 'L');
+ // long test
+ else if (DoTestNow(cfg, 'S')>0)
+ DoSCSISelfTest(fd, cfg, 'S');
}
CloseDevice(fd, name);
return 0;
diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp
index 61c816046..cb50de003 100644
--- a/sm5/smartd.cpp
+++ b/sm5/smartd.cpp
@@ -69,7 +69,7 @@
extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid,
*knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
-const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.251 2003/12/01 21:53:43 ballen4705 Exp $"
+const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.252 2003/12/01 22:24:31 ballen4705 Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID
SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
@@ -1646,11 +1646,11 @@ int SCSICheckDevice(cfgfile *cfg)
// Doug, here's where you add scheduled self-tests
if (cfg->testregexp) {
// short test
- if (DoTestNow(cfg, 'S')>0)
- DoSCSISelfTest(fd, cfg, 'S');
- // long test
- else if (DoTestNow(cfg, 'L')>0)
+ if (DoTestNow(cfg, 'L')>0)
DoSCSISelfTest(fd, cfg, 'L');
+ // long test
+ else if (DoTestNow(cfg, 'S')>0)
+ DoSCSISelfTest(fd, cfg, 'S');
}
CloseDevice(fd, name);
return 0;
--
GitLab